From bcc8731efe65f9184cc46edcbbf79771759b8d84 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 Oct 2013 19:00:40 +0100 Subject: patches to support booting from my grub --- xen/arch/x86/boot/trampoline.S | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xen/arch/x86/boot/trampoline.S') 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 -- cgit v1.2.3