[Xen-ia64-devel] Re: [Xen-devel] please pull xen-ia64-unstable.hg

[DOI Tsunehisa <Doi.Tsunehisa@xxxxxxxxxxxxxx>]

Hi,

Alex Williamson wrote:
> This includes a fairly small number of changesets that I'd like to get
> in before 3.0.3.  Changes include: finishing the PV-on-HVM driver
> support for ia64, fix an error when an FPSWA interface is not installed,
> add a few EFI calls to support hwclock, add some more perfc counters,
> and fix ia64 HVM domain creation.  Thanks,

  Please apply these patches, also.

  These patches are needed to be enabling the PV-on-HVM driver for IPF.

   * cutoff.patch
     + cut off unused codes for IA64
       - get_hypercall_stabs() is x86 specific function. We don't use
         it, and it occurrs compile error on ia64 platform.
         Thus it is cut off.
   * build.patch
     + modify build rule for IA64
       - This patch appends a build rule for ia64 platform to
         mkbuildtree command.

  They are same with the patches posted last week, except that they are
based on current tree. (xen-unstable.hg(cs:11440))

Thanks,
- Tsunehisa Doi

# HG changeset patch
# User Doi.Tsunehisa@xxxxxxxxxxxxxx
# Node ID 1701214917e68a271f19a1a528b68253bbfab3b4
# Parent  bfd00b317815f2d1c8989b55a4cfd174da043e43
Modify platform-pci for PV-on-HVM on IA64

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>

diff -r bfd00b317815 -r 1701214917e6 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Mon Sep 11 
01:55:03 2006 +0100
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Tue Sep 12 
16:24:14 2006 +0900
@@ -117,6 +117,7 @@ unsigned long alloc_xen_mmio(unsigned lo
        return addr;
 }
 
+#ifndef __ia64__
 /* Lifted from hvmloader.c */
 static int get_hypercall_stubs(void)
 {
@@ -162,6 +163,7 @@ static int get_hypercall_stubs(void)
 
        return 0;
 }
+#endif /* !__ia64__ */
 
 static int __devinit platform_pci_init(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
@@ -203,10 +205,12 @@ static int __devinit platform_pci_init(s
        platform_mmio = mmio_addr;
        platform_mmiolen = mmio_len;
 
+#ifndef __ia64__
        ret = get_hypercall_stubs();
        if (ret < 0)
                goto out;
 
+#endif /* __ia64__ */
        
        if ((ret = init_xen_info()))
                goto out;

# HG changeset patch
# User Doi.Tsunehisa@xxxxxxxxxxxxxx
# Node ID 2d7aa6bd24ba5bf832bac948539803f046b3981d
# Parent  1701214917e68a271f19a1a528b68253bbfab3b4
Modify build rule for PV-on-HVM on IA64

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>

diff -r 1701214917e6 -r 2d7aa6bd24ba unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Tue Sep 12 16:24:14 2006 +0900
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Tue Sep 12 16:25:30 2006 +0900
@@ -42,6 +42,12 @@ i[34567]86)
        ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm
        ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
        ;;
+"ia64")
+       ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
+       ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
+       ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
+       ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
+       ;;
 *)
        echo unknown architecture $uname
        exit 1

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel