From f68fd5f480248ca49e20e30a8e2387bc54694580 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Wed, 17 Oct 2007 18:04:34 +0200 Subject: x86: call free_init_pages() with irqs enabled in alternative_instructions() In alternative_instructions(), call free_init_pages() with irqs enabled. It fixes the warning message in smp_call_function*(), which should not be called with irqs disabled. [ 0.310000] CPU: L1 I Cache: 64K (64 bytes/line), D cache 64K (64 bytes/line) [ 0.310000] CPU: L2 Cache: 512K (64 bytes/line) [ 0.310000] CPU 0/0 -> Node 0 [ 0.310000] SMP alternatives: switching to UP code [ 0.310000] Freeing SMP alternatives: 25k freed [ 0.310000] WARNING: at arch/x86_64/kernel/smp.c:397 smp_call_function_mask() [ 0.310000] [ 0.310000] Call Trace: [ 0.310000] [] dump_trace+0x3ee/0x4a0 [ 0.310000] [] show_trace+0x43/0x70 [ 0.310000] [] dump_stack+0x15/0x20 [ 0.310000] [] smp_call_function_mask+0x94/0xa0 [ 0.310000] [] smp_call_function+0x32/0x40 [ 0.310000] [] on_each_cpu+0x1f/0x50 [ 0.310000] [] global_flush_tlb+0x8c/0x110 [ 0.310000] [] free_init_pages+0xe5/0xf0 [ 0.310000] [] alternative_instructions+0x7e/0x150 [ 0.310000] [] check_bugs+0x1a/0x20 [ 0.310000] [] start_kernel+0x2da/0x380 [ 0.310000] [] _sinittext+0x132/0x140 [ 0.310000] [ 0.320000] ACPI: Core revision 20070126 [ 0.560000] Using local APIC timer interrupts. [ 0.590000] Detected 62.496 MHz APIC timer. [ 0.590000] Brought up 1 CPUs [ tglx: arch/x86 adaptation ] Cc: Laurent Vivier Cc: Andi Kleen Signed-off-by: Fengguang Wu Signed-off-by: Andi Kleen Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- arch/x86/kernel/alternative.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'arch/x86/kernel/alternative.c') diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 11b03d3c6fda..dff1c9e1c2ee 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -415,9 +415,6 @@ void __init alternative_instructions(void) alternatives_smp_unlock(__smp_locks, __smp_locks_end, _text, _etext); } - free_init_pages("SMP alternatives", - (unsigned long)__smp_locks, - (unsigned long)__smp_locks_end); } else { alternatives_smp_module_add(NULL, "core kernel", __smp_locks, __smp_locks_end, @@ -428,6 +425,11 @@ void __init alternative_instructions(void) apply_paravirt(__parainstructions, __parainstructions_end); local_irq_restore(flags); + if (smp_alt_once) + free_init_pages("SMP alternatives", + (unsigned long)__smp_locks, + (unsigned long)__smp_locks_end); + restart_nmi(); #ifdef CONFIG_X86_MCE restart_mce(); -- cgit v1.2.2