73 lines
2.6 KiB
Diff
73 lines
2.6 KiB
Diff
# HG changeset patch
|
|
# User awilliam@xenbuild.aw
|
|
# Date Sat Oct 14 16:28:32 2006 -0600
|
|
# Node ID 7c2a5f96a192a07cc73991a52ff3ffd80658cf94
|
|
# parent: 9e8fdcc46fa31a6e4f607c67e97f8a9d3fa0455c
|
|
[IA64] Xencomm fixes for HVM PV-drivers
|
|
|
|
Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
|
|
|
|
|
|
|
|
Index: xen-3.0.3-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
|
===================================================================
|
|
--- xen-3.0.3-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
|
|
+++ xen-3.0.3-testing/unmodified_drivers/linux-2.6/mkbuildtree
|
|
@@ -27,6 +27,7 @@ mkdir -p include
|
|
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
|
|
@@ -54,6 +55,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
|
|
Index: xen-3.0.3-testing/unmodified_drivers/linux-2.6/platform-pci/Kbuild
|
|
===================================================================
|
|
--- xen-3.0.3-testing.orig/unmodified_drivers/linux-2.6/platform-pci/Kbuild
|
|
+++ xen-3.0.3-testing/unmodified_drivers/linux-2.6/platform-pci/Kbuild
|
|
@@ -5,3 +5,8 @@ obj-m := xen-platform-pci.o
|
|
EXTRA_CFLAGS += -I$(M)/platform-pci
|
|
|
|
xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o features.o platform-compat.o
|
|
+
|
|
+# Can we do better ?
|
|
+ifeq ($(ARCH),ia64)
|
|
+ xen-platform-pci-objs += xcom_mini.o xencomm.o
|
|
+endif
|
|
Index: xen-3.0.3-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
===================================================================
|
|
--- xen-3.0.3-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
+++ xen-3.0.3-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
|
|
@@ -36,6 +36,9 @@
|
|
#include <asm/pgtable.h>
|
|
#include <xen/interface/memory.h>
|
|
#include <xen/features.h>
|
|
+#ifdef __ia64__
|
|
+#include <asm/xen/xencomm.h>
|
|
+#endif
|
|
|
|
#include "platform-pci.h"
|
|
|
|
@@ -64,6 +67,10 @@ static int __init init_xen_info(void)
|
|
struct xen_add_to_physmap xatp;
|
|
extern void *shared_info_area;
|
|
|
|
+#ifdef __ia64__
|
|
+ xencomm_init();
|
|
+#endif
|
|
+
|
|
setup_xen_features();
|
|
|
|
shared_info_frame = alloc_xen_mmio(PAGE_SIZE) >> PAGE_SHIFT;
|