diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2007-12-10 11:34:02 +0000 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2007-12-10 11:34:02 +0000 |
commit | efc1fcfe555c03b74846c6d11b347341a0a4bf53 (patch) | |
tree | 0328e2c91a7da79a3ea902b0e91ea8c8fc269ef5 /xen/arch/x86/boot/trampoline.S | |
parent | 6893569268c4530128829aaa2495c2a222a63ea0 (diff) | |
download | xen-efc1fcfe555c03b74846c6d11b347341a0a4bf53.tar.gz xen-efc1fcfe555c03b74846c6d11b347341a0a4bf53.tar.bz2 xen-efc1fcfe555c03b74846c6d11b347341a0a4bf53.zip |
x86: Clean up boot/wakeup code.
* Generalise wakeup stack to general 'early stack' used everywhere.
* Ensure things that must be aligned are aligned.
* Remove some unused symbols.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/boot/trampoline.S')
-rw-r--r-- | xen/arch/x86/boot/trampoline.S | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index 6ffaa811ef..2c92dc6a00 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -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(early_stack),%sp lidt bootsym(rm_idt) sti @@ -202,3 +202,8 @@ rm_idt: .word 256*4-1, 0, 0 #include "mem.S" #include "edd.S" #include "video.S" +#include "wakeup.S" + + .align 16 + .fill PAGE_SIZE,1,0 +early_stack: |