aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGravatar Andi Kleen <andi@firstfloor.org> 2008-12-15 23:33:10 +0100
committerGravatar Ingo Molnar <mingo@elte.hu> 2008-12-16 23:03:02 +0100
commitcf9b303e55da810255638c0b616b1a3f7eda9320 (patch)
treebeb7823feed941932975f19e42e89a1c79d7a4be /arch
parentAMD IOMMU: allocate rlookup_table with __GFP_ZERO (diff)
downloadlinux-cf9b303e55da810255638c0b616b1a3f7eda9320.tar.gz
linux-cf9b303e55da810255638c0b616b1a3f7eda9320.tar.bz2
linux-cf9b303e55da810255638c0b616b1a3f7eda9320.zip
x86: re-enable MCE on secondary CPUS after suspend/resume
Impact: fix disabled MCE after resume Don't prevent multiple initialization of MCEs. Back from early prehistory mcheck_init() has a reentry check. Presumably that was needed in very old kernels to prevent it entering twice. But as Andreas points out this prevents CPU hotplug (and therefore resume) to correctly reinitialize MCEs when a AP boots again after being offlined. Just drop the check. Reported-by: Andreas Herrmann <andreas.herrmann3@amd.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Tested-by: Andreas Herrmann <andreas.herrmann3@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_64.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 4b031a4ac856..1c838032fd37 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -510,12 +510,9 @@ static void __cpuinit mce_cpu_features(struct cpuinfo_x86 *c)
*/
void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
{
- static cpumask_t mce_cpus = CPU_MASK_NONE;
-
mce_cpu_quirks(c);
if (mce_dont_init ||
- cpu_test_and_set(smp_processor_id(), mce_cpus) ||
!mce_available(c))
return;