# HG changeset patch
# User Tristan Gingold <tgingold@xxxxxxx>
# Date 1181621266 -7200
# Node ID 7e8534c5598abc73d40475132256d9890771d4d9
# Parent  ed3dca63e792a5c6de3bb89455fdd35d7b14d325
Slightly modify xen memory map to make room for IO space.

Signed-off-by: Tristan Gingold <tgingold@xxxxxxx>

diff -r ed3dca63e792 -r 7e8534c5598a xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile	Tue Jun 12 05:49:13 2007 +0200
+++ b/xen/arch/ia64/Makefile	Tue Jun 12 06:07:46 2007 +0200
@@ -60,7 +60,7 @@ asm-xsi-offsets.s: asm-xsi-offsets.c $(H
 	 || ln -sf $(BASEDIR)/include/asm-ia64/linux $(BASEDIR)/include/asm-ia64/xen
 
 # I'm sure a Makefile wizard would know a better way to do this
-xen.lds.s: xen/xen.lds.S
+xen.lds.s: xen/xen.lds.S $(HDRS)
 	$(CC) -E $(CPPFLAGS) -P -DXEN $(AFLAGS) \
 		-o xen.lds.s xen/xen.lds.S
 
diff -r ed3dca63e792 -r 7e8534c5598a xen/include/asm-ia64/xensystem.h
--- a/xen/include/asm-ia64/xensystem.h	Tue Jun 12 05:49:13 2007 +0200
+++ b/xen/include/asm-ia64/xensystem.h	Tue Jun 12 06:07:46 2007 +0200
@@ -19,11 +19,11 @@
 #define HYPERVISOR_VIRT_START	 0xe800000000000000
 #define KERNEL_START		 0xf000000004000000
 #define GATE_ADDR		KERNEL_START
-#define DEFAULT_SHAREDINFO_ADDR	 0xf100000000000000
+#define DEFAULT_SHAREDINFO_ADDR	 0xf500000000000000
 #define PERCPU_ADDR		 (DEFAULT_SHAREDINFO_ADDR - PERCPU_PAGE_SIZE)
 #ifdef CONFIG_VIRTUAL_FRAME_TABLE
-#define VIRT_FRAME_TABLE_ADDR	 0xf300000000000000
-#define VIRT_FRAME_TABLE_END	 0xf400000000000000
+#define VIRT_FRAME_TABLE_ADDR	 0xf600000000000000
+#define VIRT_FRAME_TABLE_END	 0xf700000000000000
 #endif
 #define HYPERVISOR_VIRT_END	 0xf800000000000000