From: "Jan Beulich" Subject: [PATCH] x86: eliminate hard-coded constants Date: Mon, 10 Dec 2007 09:19:37 +0000 Message-ID: <475D12B9.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org .. avoiding potential future collisions. Signed-off-by: Jan Beulich Index: 2007-11-13/xen/arch/x86/boot/head.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2007-11-13.orig/xen/arch/x86/boot/head.S 2007-11-14 09:57:18.0000000= 00 +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 =20 - mov $0x90000,%esp + mov $sym_phys(wakeup_stack),%esp call cmdline_parse_early =20 /* Jump into the relocated trampoline. */ Index: 2007-11-13/xen/arch/x86/boot/trampoline.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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.0000000= 00 +0100 @@ -150,8 +150,8 @@ trampoline_boot_cpu_entry: mov %ax,%es mov %ax,%ss =20 - /* 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 =20 Index: 2007-11-13/xen/arch/x86/boot/video.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2007-11-13.orig/xen/arch/x86/boot/video.S 2007-10-25 11:02:14.0000000= 00 +0200 +++ 2007-11-13/xen/arch/x86/boot/video.S 2007-11-14 11:00:25.0000000= 00 +0100 @@ -15,8 +15,8 @@ =20 #include "video.h" =20 -/* 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 */ =20