From e9099bb2195f13876305ffc540ce25760040a515 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 20 Jun 2012 21:18:14 -0700 Subject: [PATCH] --- yaml --- r: 312443 b: refs/heads/master c: 2b1b712f050eaf0ac576591281446dc960c0afc5 h: refs/heads/master i: 312441: 3d7b439d269f5e2bb3f1cffe6c79a4b43dda0e96 312439: 2b350ba6d153c109f62e880fb8d6a375efc87e12 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4e78fd5fa00e..ddbdd806ee54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 650513979a437c32d7a0a84f0ed952a55bbb5583 +refs/heads/master: 2b1b712f050eaf0ac576591281446dc960c0afc5 diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c index 6ddb9cd0ced0..6ef559f09acd 100644 --- a/trunk/arch/x86/kernel/reboot.c +++ b/trunk/arch/x86/kernel/reboot.c @@ -179,14 +179,6 @@ void __noreturn machine_real_restart(unsigned int type) write_cr3(real_mode_header->trampoline_pgd); #endif - /* - * Write 0x1234 to absolute memory location 0x472. The BIOS reads - * this on booting to tell it to "Bypass memory test (also warm - * boot)". This seems like a fairly standard thing that gets set by - * REBOOT.COM programs, and the previous reset routine did this - * too. */ - *((unsigned short *)0x472) = reboot_mode; - /* Jump to the identity-mapped low memory code */ #ifdef CONFIG_X86_32 asm volatile("jmpl *%0" : :