[Xen-changelog] [xen-unstable] [IA64] Xencomm fixes for HVM PV-drivers

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 7c2a5f96a192a07cc73991a52ff3ffd80658cf94
# Parent  9e8fdcc46fa31a6e4f607c67e97f8a9d3fa0455c
[IA64] Xencomm fixes for HVM PV-drivers

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>
---
 unmodified_drivers/linux-2.6/mkbuildtree                 |    5 +++++
 unmodified_drivers/linux-2.6/platform-pci/Kbuild         |    5 +++++
 unmodified_drivers/linux-2.6/platform-pci/platform-pci.c |    7 +++++++
 3 files changed, 17 insertions(+)

diff -r 9e8fdcc46fa3 -r 7c2a5f96a192 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Sat Oct 14 16:26:27 2006 -0600
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Sat Oct 14 16:28:32 2006 -0600
@@ -19,6 +19,7 @@ mkdir -p include/xen
 mkdir -p include/xen
 mkdir -p include/public
 mkdir -p include/asm
+mkdir -p include/asm/xen
 
 lndir -silent ${XL}/include/xen include/xen
 ln -sf ${XEN}/include/public include/xen/interface
@@ -47,6 +48,10 @@ i[34567]86)
        ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
        ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
        ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
+       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
        ;;
 *)
        echo unknown architecture $uname
diff -r 9e8fdcc46fa3 -r 7c2a5f96a192 
unmodified_drivers/linux-2.6/platform-pci/Kbuild
--- a/unmodified_drivers/linux-2.6/platform-pci/Kbuild  Sat Oct 14 16:26:27 
2006 -0600
+++ b/unmodified_drivers/linux-2.6/platform-pci/Kbuild  Sat Oct 14 16:28:32 
2006 -0600
@@ -5,3 +5,8 @@ EXTRA_CFLAGS += -I$(M)/platform-pci
 EXTRA_CFLAGS += -I$(M)/platform-pci
 
 xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o 
features.o
+
+# Can we do better ?
+ifeq ($(ARCH),ia64)
+  xen-platform-pci-objs += xcom_mini.o xencomm.o
+endif
diff -r 9e8fdcc46fa3 -r 7c2a5f96a192 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Sat Oct 14 
16:26:27 2006 -0600
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Sat Oct 14 
16:28:32 2006 -0600
@@ -35,6 +35,9 @@
 #include <asm/hypervisor.h>
 #include <xen/interface/memory.h>
 #include <xen/features.h>
+#ifdef __ia64__
+#include <asm/xen/xencomm.h>
+#endif
 
 #include "platform-pci.h"
 
@@ -58,6 +61,10 @@ static int __init init_xen_info(void)
        unsigned long shared_info_frame;
        struct xen_add_to_physmap xatp;
        extern void *shared_info_area;
+
+#ifdef __ia64__
+       xencomm_init();
+#endif
 
        setup_xen_features();
 

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