summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang, Ying <ying.huang@intel.com>2008-01-30 13:34:10 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:34:10 +0100
commitbed23c67fe077b4d66cb3329263d7cfa33b3fd67 (patch)
tree464fa88e8f813439a2e3946463089b84bee4dd14
parent19f0dda91e0dcb38c97bbfcff62b108a3bbc7907 (diff)
downloadlinux-stable-bed23c67fe077b4d66cb3329263d7cfa33b3fd67.tar.gz
linux-stable-bed23c67fe077b4d66cb3329263d7cfa33b3fd67.tar.bz2
linux-stable-bed23c67fe077b4d66cb3329263d7cfa33b3fd67.zip
x86: use reboot_type on EFI 32
This patch makes reboot_type of BOOT_EFI is used on i386 too. Because correpsonding reboot code of i386 and x86_64 is merged. Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/efi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index a70fe77354b8..174b067b9d03 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -371,11 +371,9 @@ void __init efi_init(void)
printk(KERN_WARNING "Kernel-defined memdesc"
"doesn't match the one from EFI!\n");
-#ifdef CONFIG_X86_64
/* Setup for EFI runtime service */
reboot_type = BOOT_EFI;
-#endif
#if EFI_DEBUG
print_efi_memmap();
#endif