Prev: [110/197] x86, cacheinfo: Fix disabling of L3 cache indices
Next: [101/197] drm/i915: Add no_lvds entry for the Clientron U800
From: Greg KH on 22 Apr 2010 16:00
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: Suresh Siddha <suresh.b.siddha(a)intel.com>

commit 472a474c6630efd195d3738339fd1bdc8aa3b1aa upstream.

Jan Grossmann reported kernel boot panic while booting SMP
kernel on his system with a single core cpu. SMP kernels call
enable_IR_x2apic() from native_smp_prepare_cpus() and on
platforms where the kernel doesn't find SMP configuration we
ended up again calling enable_IR_x2apic() from the
APIC_init_uniprocessor() call in the smp_sanity_check(). Thus
leading to kernel panic.

Don't call enable_IR_x2apic() and default_setup_apic_routing()
from APIC_init_uniprocessor() in CONFIG_SMP case.

NOTE: this kind of non-idempotent and assymetric initialization
sequence is rather fragile and unclean, we'll clean that up
in v2.6.35. This is the minimal fix for v2.6.34.

Reported-by: Jan.Grossmann(a)kielnet.net
Signed-off-by: Suresh Siddha <suresh.b.siddha(a)intel.com>
Cc: <jbarnes(a)virtuousgeek.org>
Cc: <david.woodhouse(a)intel.com>
Cc: <weidong.han(a)intel.com>
Cc: <youquan.song(a)intel.com>
Cc: <Jan.Grossmann(a)kielnet.net>
LKML-Reference: <1270083887.7835.78.camel(a)sbs-t61.sc.intel.com>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
arch/x86/kernel/apic/apic.c | 2 ++
1 file changed, 2 insertions(+)

--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1664,8 +1664,10 @@ int __init APIC_init_uniprocessor(void)
}
#endif

+#ifndef CONFIG_SMP
enable_IR_x2apic();
default_setup_apic_routing();
+#endif

verify_local_APIC();
connect_bsp_APIC();


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [110/197] x86, cacheinfo: Fix disabling of L3 cache indices
Next: [101/197] drm/i915: Add no_lvds entry for the Clientron U800