From 67da75ef932955e54b08a545471c7770bb35b72b Mon Sep 17 00:00:00 2001
From: Borislav Petkov <borislav.petkov@amd.com>
Date: Fri, 16 Oct 2009 12:31:33 +0200
Subject: [PATCH] --- yaml --- r: 169871 b: refs/heads/master c:
 b33a6363649f0ff83ec81597ea7fe7e688f973cb h: refs/heads/master i:   169869:
 bd36a6459649f9b83449b808b4f1ec0c1f090969   169867:
 3fc3e01e9be5938a93586f7f8479b33f56c52433   169863:
 708f27da19f234c649c8c1dc42df0e0102b1e585   169855:
 5b68cb36ecc23ab6296e520e1651e18bcd5d9ea3 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ab3842be631e..a1ad8a3f0b9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e09954a9acc3b435ffe318b95afd3c02fae069f
+refs/heads/master: b33a6363649f0ff83ec81597ea7fe7e688f973cb
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index 68d968e69b13..80801705edd7 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1436,8 +1436,6 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
 	__mcheck_cpu_init_timer();
 	INIT_WORK(&__get_cpu_var(mce_work), mce_process_work);
 
-	if (raw_smp_processor_id() == 0)
-		atomic_notifier_chain_register(&x86_mce_decoder_chain, &mce_dec_nb);
 }
 
 /*
@@ -1657,6 +1655,14 @@ static int __init mcheck_enable(char *str)
 }
 __setup("mce", mcheck_enable);
 
+static int __init mcheck_init(void)
+{
+	atomic_notifier_chain_register(&x86_mce_decoder_chain, &mce_dec_nb);
+
+	return 0;
+}
+early_initcall(mcheck_init);
+
 /*
  * Sysfs support
  */