projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: be60828)
x86, realmode: Fix always-zero test in reboot_32.S
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 8 May 2012 18:22:39 +0000 (21:22 +0300)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 8 May 2012 18:48:04 +0000 (11:48 -0700)
A test instruction is an "and", and an and with zero is always zero.
This would cause us to always take the BIOS path, not the APM path, in
case anyone actually cares...

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-17-git-send-email-jarkko.sakkinen@intel.com
arch/x86/realmode/rm/reboot_32.S patch | blob | history

diff --git a/arch/x86/realmode/rm/reboot_32.S b/arch/x86/realmode/rm/reboot_32.S
index e90f8c4..50ba994 100644 (file)
--- a/arch/x86/realmode/rm/reboot_32.S
+++ b/arch/x86/realmode/rm/reboot_32.S
@@ -85,7 +85,7 @@ machine_real_restart_asm16:
        movl    %edx, %cr0
        LJMPW_RM(3f)
 3:
-       testb   $0, %al
+       andw    %ax, %ax
        jz      bios
 
 apm: