summaryrefslogtreecommitdiff
path: root/arch/x86/realmode
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-05-08 18:22:39 (GMT)
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-08 18:48:04 (GMT)
commit6feb592dceaed1a6cf26c9747b1180958d5156cd (patch)
treebb28e736267ea2fed45f28e04d54bb85ee9528e8 /arch/x86/realmode
parentbe60828920d23758da8124bed771404a0438f369 (diff)
downloadlinux-fsl-qoriq-6feb592dceaed1a6cf26c9747b1180958d5156cd.tar.xz
x86, realmode: Fix always-zero test in reboot_32.S
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
Diffstat (limited to 'arch/x86/realmode')
-rw-r--r--arch/x86/realmode/rm/reboot_32.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/realmode/rm/reboot_32.S b/arch/x86/realmode/rm/reboot_32.S
index e90f8c4..50ba994 100644
--- 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: