aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-06-21 00:18:14 -0400
committerH. Peter Anvin <hpa@zytor.com>2012-06-21 00:18:14 -0400
commit2b1b712f050eaf0ac576591281446dc960c0afc5 (patch)
tree44ef6a4039cd0a1f4aa20bdd8d236f95b98bc680 /arch
parent650513979a437c32d7a0a84f0ed952a55bbb5583 (diff)
x86, reboot: Drop redundant write of reboot_mode
We write reboot_mode to BIOS location 0x472 in native_machine_emergency_restart() (reboot.c:542) already, there is no need to then write it again in machine_real_restart(). This means nothing gets written there for MRR_APM, but the APM call is a poweroff call and doesn't use this memory location. Link: http://lkml.kernel.org/n/tip-3i0pfh44c1e3jv5lab0cf7sc@git.kernel.org Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/reboot.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 6ddb9cd0ced0..6ef559f09acd 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -179,14 +179,6 @@ void __noreturn machine_real_restart(unsigned int type)
179 write_cr3(real_mode_header->trampoline_pgd); 179 write_cr3(real_mode_header->trampoline_pgd);
180#endif 180#endif
181 181
182 /*
183 * Write 0x1234 to absolute memory location 0x472. The BIOS reads
184 * this on booting to tell it to "Bypass memory test (also warm
185 * boot)". This seems like a fairly standard thing that gets set by
186 * REBOOT.COM programs, and the previous reset routine did this
187 * too. */
188 *((unsigned short *)0x472) = reboot_mode;
189
190 /* Jump to the identity-mapped low memory code */ 182 /* Jump to the identity-mapped low memory code */
191#ifdef CONFIG_X86_32 183#ifdef CONFIG_X86_32
192 asm volatile("jmpl *%0" : : 184 asm volatile("jmpl *%0" : :