[Xen-changelog] [xen-unstable] Fix unmodified drivers for PV-on-HVM on IA64.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 3bff5c5b9206eec951e649aff006379009dc5a2a
# Parent  7474bb5e29233d20ff45383c96bbee556bbb376a
Fix unmodified drivers for PV-on-HVM on IA64.

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/mkbuildtree                 |    6 ++++++
 unmodified_drivers/linux-2.6/platform-pci/platform-pci.c |    5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff -r 7474bb5e2923 -r 3bff5c5b9206 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Wed Sep 13 14:30:06 2006 +0100
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Wed Sep 13 14:34:34 2006 +0100
@@ -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
diff -r 7474bb5e2923 -r 3bff5c5b9206 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Wed Sep 13 
14:30:06 2006 +0100
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Wed Sep 13 
14:34:34 2006 +0100
@@ -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,9 @@ static int get_hypercall_stubs(void)
 
        return 0;
 }
+#else /* __ia64__ */
+#define get_hypercall_stubs()  (0)
+#endif
 
 static int __devinit platform_pci_init(struct pci_dev *pdev,
                                       const struct pci_device_id *ent)
@@ -207,7 +211,6 @@ static int __devinit platform_pci_init(s
        if (ret < 0)
                goto out;
 
-       
        if ((ret = init_xen_info()))
                goto out;
 

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