# HG changeset patch
# User Doi.Tsunehisa@jp.fujitsu.com
# Node ID 1701214917e68a271f19a1a528b68253bbfab3b4
# Parent  bfd00b317815f2d1c8989b55a4cfd174da043e43
Modify platform-pci 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>

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;