aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_32.c
diff options
context:
space:
mode:
authorHuang, Ying <ying.huang@intel.com>2008-01-30 07:32:11 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:32:11 -0500
commit8b2cb7a8f531d6ca72a8aff873b9bb1c6b3122ba (patch)
treef53edab6bdc4e1f39ef2cea8d13f15242617262e /arch/x86/kernel/setup_32.c
parentbfd074e05bdb69652d24ebc60b126899174ca788 (diff)
x86: 32-bit EFI runtime service support: fixes in sync with 64-bit support
support according to fixes of x86_64 support. - Delete efi_rt_lock because it is used during system early boot, before SMP is initialized. - Change local_flush_tlb() to __flush_tlb_all() to flush global page mapping. - Clean up includes. - Revise Kconfig description. - Enable noefi kernel parameter on i386. Signed-off-by: Huang Ying <ying.huang@intel.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r--arch/x86/kernel/setup_32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 2e805da337a2..704550fdb84c 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -648,9 +648,6 @@ void __init setup_arch(char **cmdline_p)
648 printk(KERN_INFO "BIOS-provided physical RAM map:\n"); 648 printk(KERN_INFO "BIOS-provided physical RAM map:\n");
649 print_memory_map(memory_setup()); 649 print_memory_map(memory_setup());
650 650
651 if (efi_enabled)
652 efi_init();
653
654 copy_edd(); 651 copy_edd();
655 652
656 if (!boot_params.hdr.root_flags) 653 if (!boot_params.hdr.root_flags)
@@ -677,6 +674,9 @@ void __init setup_arch(char **cmdline_p)
677 strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); 674 strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
678 *cmdline_p = command_line; 675 *cmdline_p = command_line;
679 676
677 if (efi_enabled)
678 efi_init();
679
680 max_low_pfn = setup_memory(); 680 max_low_pfn = setup_memory();
681 681
682#ifdef CONFIG_VMI 682#ifdef CONFIG_VMI