Move the definition of __FIXADDR_TOP into a subarch include file so
that it can be overridden for subarch xen -- the hypervisor needs
about 64MB at the top of the address space.
Signed-off-by: Ian Pratt <ian.pratt@xxxxxxxxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
Signed-off-by: Chris Wright <chrisw@xxxxxxxxxxxx>
---
 include/asm-i386/fixmap.h | 8 +-------
 include/asm-i386/mach-default/mach_fixmap.h | 11 +++++++++++
 include/asm-i386/mach-xen/mach_fixmap.h | 11 +++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)
diff -r 1c88b225d413 include/asm-i386/fixmap.h
--- a/include/asm-i386/fixmap.h Thu Jun 22 16:02:54 2006 -0400
+++ b/include/asm-i386/fixmap.h Thu Jun 22 16:05:56 2006 -0400
@@ -13,13 +13,7 @@
 #ifndef _ASM_FIXMAP_H
 #define _ASM_FIXMAP_H
 
-
-/* used by vmalloc.c, vsyscall.lds.S.
- *
- * Leave one empty page between vmalloc'ed areas and
- * the start of the fixmap.
- */
-#define __FIXADDR_TOP 0xfffff000
+#include <mach_fixmap.h>
 
 #ifndef __ASSEMBLY__
 #include <linux/kernel.h>
diff -r 1c88b225d413 include/asm-i386/mach-default/mach_fixmap.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/asm-i386/mach-default/mach_fixmap.h Thu Jun 22 16:05:56 
2006 -0400
@@ -0,0 +1,11 @@
+#ifndef __ASM_MACH_FIXMAP_H
+#define __ASM_MACH_FIXMAP_H
+
+/* used by vmalloc.c, vsyscall.lds.S.
+ *
+ * Leave one empty page between vmalloc'ed areas and
+ * the start of the fixmap.
+ */
+#define __FIXADDR_TOP 0xfffff000
+
+#endif /* __ASM_MACH_FIXMAP_H */
diff -r 1c88b225d413 include/asm-i386/mach-xen/mach_fixmap.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/asm-i386/mach-xen/mach_fixmap.h Thu Jun 22 16:05:56 2006 -0400
@@ -0,0 +1,13 @@
+#ifndef __ASM_MACH_FIXMAP_H
+#define __ASM_MACH_FIXMAP_H
+
+#include <xen/interface/xen.h>
+
+/* used by vmalloc.c, vsyscall.lds.S.
+ *
+ * Leave one empty page between vmalloc'ed areas and
+ * the start of the fixmap.
+ */
+#define __FIXADDR_TOP (HYPERVISOR_VIRT_START - 2 * PAGE_SIZE)
+
+#endif /* __ASM_MACH_FIXMAP_H */
--
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel