[Xen-devel] [PATCH] x86: eliminate hard-coded constants

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

.. avoiding potential future collisions.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: 2007-11-13/xen/arch/x86/boot/head.S
===================================================================
--- 2007-11-13.orig/xen/arch/x86/boot/head.S    2007-11-14 09:57:18.000000000 
+0100
+++ 2007-11-13/xen/arch/x86/boot/head.S 2007-11-14 10:22:34.000000000 +0100
@@ -168,7 +168,7 @@ __start:
         mov     $trampoline_end - trampoline_start,%ecx
         rep     movsb
 
-        mov     $0x90000,%esp
+        mov     $sym_phys(wakeup_stack),%esp
         call    cmdline_parse_early
 
         /* Jump into the relocated trampoline. */
Index: 2007-11-13/xen/arch/x86/boot/trampoline.S
===================================================================
--- 2007-11-13.orig/xen/arch/x86/boot/trampoline.S      2007-11-02 
17:25:56.000000000 +0100
+++ 2007-11-13/xen/arch/x86/boot/trampoline.S   2007-11-14 10:23:49.000000000 
+0100
@@ -150,8 +150,8 @@ trampoline_boot_cpu_entry:
         mov     %ax,%es
         mov     %ax,%ss
 
-        /* Stack grows down from +0x3000. Initialise IDT and enable irqs. */
-        mov     $0x3000,%sp
+        /* Initialise stack pointer and IDT, and enable irqs. */
+        mov     $bootsym(wakeup_stack),%sp
         lidt    bootsym(rm_idt)
         sti
 
Index: 2007-11-13/xen/arch/x86/boot/video.S
===================================================================
--- 2007-11-13.orig/xen/arch/x86/boot/video.S   2007-10-25 11:02:14.000000000 
+0200
+++ 2007-11-13/xen/arch/x86/boot/video.S        2007-11-14 11:00:25.000000000 
+0100
@@ -15,8 +15,8 @@
 
 #include "video.h"
 
-/* Scratch space layout: +0x3000 to +0x4000. */
-#define modelist       (0x3000)                  /* 2kB (256 entries) */
+/* Scratch space layout: trampoline_end to trampoline_end+0x1000. */
+#define modelist       bootsym(trampoline_end)   /* 2kB (256 entries) */
 #define vesa_glob_info (modelist + 0x800)        /* 1kB */
 #define vesa_mode_info (vesa_glob_info + 0x400)  /* 1kB */
 




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