[Xen-ia64-devel] [PATCH 3/3] xencomm consolidation: PV-on-HVM

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1186235937 -32400
# Node ID ee126145d575f4f5b218a3b083dd60eb4a938631
# Parent  abd1440b700a189ac4cd7b71334dfbbeafb1d175
compilation fix of unmodified driver
PATCHNAME: unmodified_driver_compiliation_fix

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r abd1440b700a -r ee126145d575 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Mon Aug 13 12:23:36 2007 +0900
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Sat Aug 04 22:58:57 2007 +0900
@@ -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 abd1440b700a -r ee126145d575 
unmodified_drivers/linux-2.6/platform-pci/Kbuild
--- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild  Mon Aug 13 12:23:36 
2007 +0900
+++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild  Sat Aug 04 22:58:57 
2007 +0900
@@ -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 abd1440b700a -r ee126145d575 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Mon Aug 13 
12:23:36 2007 +0900
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Sat Aug 04 
22:58:57 2007 +0900
@@ -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 abd1440b700a -r ee126145d575 
unmodified_drivers/linux-2.6/platform-pci/xen_support.c
--- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Mon Aug 13 
12:23:36 2007 +0900
+++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Sat Aug 04 
22:58:57 2007 +0900
@@ -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);

Attachment: 15730_ee126145d575_unmodified_driver_compiliation_fix.patch
Description: Text Data

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