[Xen-devel] [PATCH] Always define both PAE and non-PAE address constants

[john.levon@xxxxxxx]

# HG changeset patch
# User john.levon@xxxxxxx
# Date 1186535035 25200
# Node ID 405c332de534ac1c3f085880e3ea1b494d979b5a
# Parent  24eb50ea28dea351633c80f5c517ba92395cefc1
Always define both PAE and non-PAE address constants

Solaris decides to run as PAE or not at runtime. Thus, make the
address constants for both cases always available in the public headers.

Signed-off-by: John Levon <john.levon@xxxxxxx>

diff --git a/xen/include/public/arch-x86/xen-x86_32.h 
b/xen/include/public/arch-x86/xen-x86_32.h
--- a/xen/include/public/arch-x86/xen-x86_32.h
+++ b/xen/include/public/arch-x86/xen-x86_32.h
@@ -78,14 +78,23 @@
  * Virtual addresses beyond this are not modifiable by guest OSes. The 
  * machine->physical mapping table starts at this address, read-only.
  */
+#define __VIRT_START_PAE 0xF5800000
+#define __VIRT_END_PAE 0xF6800000
+#define __VIRT_START_NONPAE 0xFC000000
+#define __VIRT_END_NONPAE 0xFC400000
+#define VIRT_START_PAE mk_unsigned_long(__VIRT_START_PAE)
+#define VIRT_END_PAE mk_unsigned_long(__VIRT_END_PAE)
+#define VIRT_START_NONPAE mk_unsigned_long(__VIRT_START_NONPAE)
+#define VIRT_END_NONPAE mk_unsigned_long(__VIRT_END_NONPAE)
+
 #ifdef CONFIG_X86_PAE
-#define __HYPERVISOR_VIRT_START 0xF5800000
-#define __MACH2PHYS_VIRT_START  0xF5800000
-#define __MACH2PHYS_VIRT_END    0xF6800000
+#define __HYPERVISOR_VIRT_START __VIRT_START_PAE
+#define __MACH2PHYS_VIRT_START  __VIRT_START_PAE
+#define __MACH2PHYS_VIRT_END    __VIRT_END_PAE
 #else
-#define __HYPERVISOR_VIRT_START 0xFC000000
-#define __MACH2PHYS_VIRT_START  0xFC000000
-#define __MACH2PHYS_VIRT_END    0xFC400000
+#define __HYPERVISOR_VIRT_START __VIRT_START_NONPAE
+#define __MACH2PHYS_VIRT_START  __VIRT_START_NONPAE
+#define __MACH2PHYS_VIRT_END    __VIRT_END_NONPAE
 #endif
 
 #ifndef HYPERVISOR_VIRT_START

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