Commit-ID: 6feb592dceaed1a6cf26c9747b1180958d5156cd Gitweb: http://git.kernel.org/tip/6feb592dceaed1a6cf26c9747b1180958d5156cd Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> AuthorDate: Tue, 8 May 2012 21:22:39 +0300 Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> CommitDate: Tue, 8 May 2012 11:48:04 -0700 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@xxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/1336501366-28617-17-git-send-email-jarkko.sakkinen@xxxxxxxxx --- 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 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: -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|