diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-08 14:22:39 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-08 14:48:04 -0400 |
| commit | 6feb592dceaed1a6cf26c9747b1180958d5156cd (patch) | |
| tree | bb28e736267ea2fed45f28e04d54bb85ee9528e8 /arch | |
| parent | be60828920d23758da8124bed771404a0438f369 (diff) | |
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')
| -rw-r--r-- | arch/x86/realmode/rm/reboot_32.S | 2 |
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 e90f8c4bbae2..50ba994ba921 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: | |||
| 85 | movl %edx, %cr0 | 85 | movl %edx, %cr0 |
| 86 | LJMPW_RM(3f) | 86 | LJMPW_RM(3f) |
| 87 | 3: | 87 | 3: |
| 88 | testb $0, %al | 88 | andw %ax, %ax |
| 89 | jz bios | 89 | jz bios |
| 90 | 90 | ||
| 91 | apm: | 91 | apm: |