* grub-core/kern/i386/pc/startup.S (grub_exit): Add missing zeroing-out.

	* grub-core/lib/i386/reboot_trampoline.S (grub_reboot_start):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5899c1e95c3f63390dd048e769ef5ab5a5cc0f4d..f5b846ddd5e98c8a4985e5f2b6f20a82d34120f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * 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  <phcoder@gmail.com>
 
        * 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 a0ef71f909ad904cc9de39d8ce7896bcea195612..5277695b18e2a420b4cc4256f61423ff6008219b 100644 (file)
--- 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 18bcfb287358b4551dc11797686cae562d92c063..c088cd081c607d5596404384a06a427c62d4d924 100644 (file)
--- 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