diff options
| author | root <root@lamia.panaceas.james.local> | 2013-10-23 19:00:40 +0100 |
|---|---|---|
| committer | root <root@lamia.panaceas.james.local> | 2013-10-23 19:00:40 +0100 |
| commit | bcc8731efe65f9184cc46edcbbf79771759b8d84 (patch) | |
| tree | 1d8224d459723644743f58fb5dd47a56f9ba928e /xen/arch/x86/boot/trampoline.S | |
| parent | 170fa9967176c8627fe2e75dbe1dc5212019afde (diff) | |
| download | xen-bcc8731efe65f9184cc46edcbbf79771759b8d84.tar.gz xen-bcc8731efe65f9184cc46edcbbf79771759b8d84.tar.bz2 xen-bcc8731efe65f9184cc46edcbbf79771759b8d84.zip | |
patches to support booting from my grub
Diffstat (limited to 'xen/arch/x86/boot/trampoline.S')
| -rw-r--r-- | xen/arch/x86/boot/trampoline.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index 827f41219d..19d476e6b5 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -117,6 +117,9 @@ high_start: .code32 trampoline_boot_cpu_entry: + jmp .Lskip_realmode + cmpb $0xff,bootsym_rel(realmode_available,5) + jnz .Lskip_realmode cmpb $0,bootsym_rel(skip_realmode,5) jnz .Lskip_realmode @@ -202,6 +205,9 @@ trampoline_boot_cpu_entry: skip_realmode: .byte 0 +realmode_available: + .byte 0xff /* non-zero as xen resets bss on init */ + GLOBAL(kbd_shift_flags) .byte 0 |