From f87e8be01d8ec7968c55959ddc8255c931374fd5 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Thu, 16 Aug 2007 13:46:50 -0600 Subject: [IA64] xencomm - compilation fix of unmodified driver Signed-off-by: Isaku Yamahata --- unmodified_drivers/linux-2.6/mkbuildtree | 4 ++-- unmodified_drivers/linux-2.6/platform-pci/Kbuild | 2 +- unmodified_drivers/linux-2.6/platform-pci/platform-pci.c | 2 +- unmodified_drivers/linux-2.6/platform-pci/xen_support.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'unmodified_drivers') diff --git a/unmodified_drivers/linux-2.6/mkbuildtree b/unmodified_drivers/linux-2.6/mkbuildtree index 6617d106a7..37aa4f9300 100755 --- a/unmodified_drivers/linux-2.6/mkbuildtree +++ b/unmodified_drivers/linux-2.6/mkbuildtree @@ -71,8 +71,8 @@ i[34567]86) mkdir -p include/asm/xen ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen - ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci - ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci + ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci/xencomm_arch.c + ln -sf ${XL}/drivers/xen/core/xencomm.c platform-pci ;; *) echo unknown architecture $uname diff --git a/unmodified_drivers/linux-2.6/platform-pci/Kbuild b/unmodified_drivers/linux-2.6/platform-pci/Kbuild index baf8e3b8bf..92ff9ca7f1 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild +++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild @@ -17,5 +17,5 @@ xen-platform-pci-objs += ../xenbus/xen_proc.o # Can we do better ? ifeq ($(ARCH),ia64) - xen-platform-pci-objs += xcom_mini.o xencomm.o + xen-platform-pci-objs += xencomm.o xencomm_arch.o endif 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 559077f465..e147f3d59a 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -73,7 +73,7 @@ static int __devinit init_xen_info(void) extern void *shared_info_area; #ifdef __ia64__ - xencomm_init(); + xencomm_initialize(); #endif setup_xen_features(); diff --git a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c index 09eb11e5c2..510a2b7b8c 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c +++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c @@ -48,7 +48,7 @@ EXPORT_SYMBOL(__hypercall); int HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count) { - return xencomm_mini_hypercall_grant_table_op(cmd, uop, count); + return xencomm_hypercall_grant_table_op(cmd, uop, count); } EXPORT_SYMBOL(HYPERVISOR_grant_table_op); -- cgit v1.2.3