# HG changeset patch # User Doi.Tsunehisa@jp.fujitsu.com # Node ID 566e35701c7dd9f2aec0af470e39054810867beb # Parent 4a17792e0a5a05caad68244abfe09948a6f2d90d Modify unmodified_drivers code for IPF Signed-off-by: Tsunehisa Doi Signed-off-by: Tomonari Horikoshi diff -r 4a17792e0a5a -r 566e35701c7d unmodified_drivers/linux-2.6/platform-pci/platform-pci.c --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c Mon Sep 04 16:04:27 2006 +0900 +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c Mon Sep 04 16:06:31 2006 +0900 @@ -115,6 +115,7 @@ unsigned long alloc_xen_mmio(unsigned lo return addr; } +#ifndef __ia64__ /* Lifted from hvmloader.c */ static int get_hypercall_stubs(void) { @@ -160,6 +161,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) @@ -201,10 +203,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;