[Xen-changelog] [xen-unstable] [IA64] xencomm - compilation fix of unmodified driver

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1187293610 21600
# Node ID 049d4baa9965b35eed8b4b4a1a2283906d956ac3
# Parent  cb3c7f00607790e06814550eb26708893f16a8bd
[IA64] xencomm - compilation fix of unmodified driver

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 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(-)

diff -r cb3c7f006077 -r 049d4baa9965 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Thu Aug 16 13:03:41 2007 -0600
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Thu Aug 16 13:46:50 2007 -0600
@@ -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 -r cb3c7f006077 -r 049d4baa9965 
unmodified_drivers/linux-2.6/platform-pci/Kbuild
--- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild  Thu Aug 16 13:03:41 
2007 -0600
+++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild  Thu Aug 16 13:46:50 
2007 -0600
@@ -17,5 +17,5 @@ xen-platform-pci-objs += ../xenbus/xen_p
 
 # 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 -r cb3c7f006077 -r 049d4baa9965 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Thu Aug 16 
13:03:41 2007 -0600
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Thu Aug 16 
13:46:50 2007 -0600
@@ -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 -r cb3c7f006077 -r 049d4baa9965 
unmodified_drivers/linux-2.6/platform-pci/xen_support.c
--- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Thu Aug 16 
13:03:41 2007 -0600
+++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Thu Aug 16 
13:46:50 2007 -0600
@@ -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);
 

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