diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-09-13 14:34:34 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-09-13 14:34:34 +0100 |
| commit | 60ddf8d64dee3224377e34e70927eff1fc593ef5 (patch) | |
| tree | 394cc3585e5d26e33e3a53bdcf5a8310a119b3d5 | |
| parent | da52271d2b4995656a905ffd94dbc006fe247d86 (diff) | |
| download | xen-60ddf8d64dee3224377e34e70927eff1fc593ef5.tar.gz xen-60ddf8d64dee3224377e34e70927eff1fc593ef5.tar.bz2 xen-60ddf8d64dee3224377e34e70927eff1fc593ef5.zip | |
Fix unmodified drivers for PV-on-HVM on IA64.
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@jp.fujitsu.com>
| -rw-r--r-- | unmodified_drivers/linux-2.6/mkbuildtree | 6 | ||||
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree index 382a493796..76e228cbe9 100644 --- a/unmodified_drivers/linux-2.6/mkbuildtree +++ b/unmodified_drivers/linux-2.6/mkbuildtree @@ -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 --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c index 6527b18e80..2bb4dbd5b4 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -117,6 +117,7 @@ unsigned long alloc_xen_mmio(unsigned long len) 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(struct pci_dev *pdev, if (ret < 0) goto out; - if ((ret = init_xen_info())) goto out; |