diff options
author | Huang, Ying <ying.huang@intel.com> | 2008-01-30 07:34:10 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:34:10 -0500 |
commit | bed23c67fe077b4d66cb3329263d7cfa33b3fd67 (patch) | |
tree | 464fa88e8f813439a2e3946463089b84bee4dd14 /arch/x86/kernel | |
parent | 19f0dda91e0dcb38c97bbfcff62b108a3bbc7907 (diff) |
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>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/efi.c | 2 |
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) | |||
371 | printk(KERN_WARNING "Kernel-defined memdesc" | 371 | printk(KERN_WARNING "Kernel-defined memdesc" |
372 | "doesn't match the one from EFI!\n"); | 372 | "doesn't match the one from EFI!\n"); |
373 | 373 | ||
374 | #ifdef CONFIG_X86_64 | ||
375 | /* Setup for EFI runtime service */ | 374 | /* Setup for EFI runtime service */ |
376 | reboot_type = BOOT_EFI; | 375 | reboot_type = BOOT_EFI; |
377 | 376 | ||
378 | #endif | ||
379 | #if EFI_DEBUG | 377 | #if EFI_DEBUG |
380 | print_efi_memmap(); | 378 | print_efi_memmap(); |
381 | #endif | 379 | #endif |