From 3ce69fc90f62b3ca01239bdc826d4960df15ce83 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 23 Oct 2011 23:04:57 +0200 Subject: [PATCH] * grub-core/kern/i386/pc/startup.S (grub_exit): Add missing zeroing-out. * grub-core/lib/i386/reboot_trampoline.S (grub_reboot_start): Likewise. --- ChangeLog | 6 ++++++ grub-core/kern/i386/pc/startup.S | 1 + grub-core/lib/i386/reboot_trampoline.S | 1 + 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5899c1e95..f5b846ddd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-23 Vladimir Serbinenko + + * grub-core/kern/i386/pc/startup.S (grub_exit): Add missing zeroing-out. + * grub-core/lib/i386/reboot_trampoline.S (grub_reboot_start): + Likewise. + 2011-10-23 Vladimir Serbinenko * grub-core/io/lzopio.c (test_header): Fix incorrect memcmp instead of diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S index a0ef71f90..5277695b1 100644 --- a/grub-core/kern/i386/pc/startup.S +++ b/grub-core/kern/i386/pc/startup.S @@ -458,6 +458,7 @@ FUNCTION(grub_exit) /* Tell the BIOS a boot failure. If this does not work, reboot. */ int $0x18 /* set 0x472 to 0x0000 for cold boot (0x1234 for warm boot) */ + xorw %ax, %ax movw $0x0472, %di movw %ax, (%di) ljmp $0xf000, $0xfff0 diff --git a/grub-core/lib/i386/reboot_trampoline.S b/grub-core/lib/i386/reboot_trampoline.S index 18bcfb287..c088cd081 100644 --- a/grub-core/lib/i386/reboot_trampoline.S +++ b/grub-core/lib/i386/reboot_trampoline.S @@ -26,6 +26,7 @@ VARIABLE(grub_reboot_start) /* set 0x472 to 0x0000 for cold boot (0x1234 for warm boot) */ movw $0x0472, %di + xorw %ax, %ax movw %ax, (%di) ljmp $0xf000, $0xfff0