Skip to contentSkip to conversation

x86, mce: fixup mce naming nomenclature

PATCH RESEND In review Borislav Petkov 1 participant 4 messages Oct 16, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/2 x86, mce: fixup mce naming nomenclature

Prefix global/setup routines with "mcheck_" thus differentiating from the internal facilities prefixed with "mce_". Also, prefix the per cpu calls with mcheck_cpu and rename them to reflect the MCE setup hierarchy of calls better.

There should be no functionality change resulting from this patch.

---
 arch/x86/include/asm/mce.h       |    4 +-
 arch/x86/kernel/cpu/common.c     |    2 +-
 arch/x86/kernel/cpu/mcheck/mce.c |   52 +++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 29 deletions(-)
arch/x86/include/asm/mce.h +2 -2
index 227a72d..161485d 100644
@@ -120,9 +120,9 @@ extern int mce_disabled;
 extern int mce_p5_enabled;
 
 #ifdef CONFIG_X86_MCE
-void mcheck_init(struct cpuinfo_x86 *c);
+void mcheck_cpu_init(struct cpuinfo_x86 *c);
 #else
-static inline void mcheck_init(struct cpuinfo_x86 *c) {}
+static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {}
 #endif
 
 #ifdef CONFIG_X86_ANCIENT_MCE
arch/x86/kernel/cpu/common.c +1 -1
index cc25c2b..4df69a3 100644
@@ -839,7 +839,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 
 #ifdef CONFIG_X86_MCE
 	/* Init Machine Check Exception if available. */
-	mcheck_init(c);
+	mcheck_cpu_init(c);
 #endif
 
 	select_idle_routine(c);
arch/x86/kernel/cpu/mcheck/mce.c +26 -26

176 lines not on this page · raw message

Signature · 1 line
1.6.4.3
#1 lore raw

PATCH RESEND 2/2 x86, mce: Add a global MCE init helper

Add an early initcall (pre SMP) which sets up global MCE functionality.

---
 arch/x86/kernel/cpu/mcheck/mce.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +8 -2
index b4a5eca..3f7ac16 100644
@@ -1429,8 +1429,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);
 }
 
 /*
@@ -1650,6 +1648,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
  */
Signature · 1 line
1.6.4.3
#2 lore raw

[tip:perf/mce] x86, mce: Add a global MCE init helper

Commit-ID:  b33a6363649f0ff83ec81597ea7fe7e688f973cb
Gitweb:     http://git.kernel.org/tip/b33a6363649f0ff83ec81597ea7fe7e688f973cb
Author:     Borislav Petkov <[email protected]>
AuthorDate: Fri, 16 Oct 2009 12:31:33 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 16 Oct 2009 14:46:50 +0200

x86, mce: Add a global MCE init helper

Add an early initcall (pre SMP) which sets up global MCE functionality.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/cpu/mcheck/mce.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +8 -2
index 68d968e..8080170 100644
@@ -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
  */
#3 lore raw

[tip:perf/mce] x86, mce: Fix up MCE naming nomenclature

In reply to Borislav Petkov
Commit-ID:  5e09954a9acc3b435ffe318b95afd3c02fae069f
Gitweb:     http://git.kernel.org/tip/5e09954a9acc3b435ffe318b95afd3c02fae069f
Author:     Borislav Petkov <[email protected]>
AuthorDate: Fri, 16 Oct 2009 12:31:32 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 16 Oct 2009 14:46:49 +0200

x86, mce: Fix up MCE naming nomenclature

Prefix global/setup routines with "mcheck_" thus differentiating from the internal facilities prefixed with "mce_". Also, prefix the per cpu calls with mcheck_cpu and rename them to reflect the MCE setup hierarchy of calls better.

There should be no functionality change resulting from this patch.

LKML-Reference: <[email protected]>

---
 arch/x86/include/asm/mce.h       |    4 +-
 arch/x86/kernel/cpu/common.c     |    2 +-
 arch/x86/kernel/cpu/mcheck/mce.c |   52 +++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 29 deletions(-)
arch/x86/include/asm/mce.h +2 -2
index 227a72d..161485d 100644
@@ -120,9 +120,9 @@ extern int mce_disabled;
 extern int mce_p5_enabled;
 
 #ifdef CONFIG_X86_MCE
-void mcheck_init(struct cpuinfo_x86 *c);
+void mcheck_cpu_init(struct cpuinfo_x86 *c);
 #else
-static inline void mcheck_init(struct cpuinfo_x86 *c) {}
+static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {}
 #endif
 
 #ifdef CONFIG_X86_ANCIENT_MCE
arch/x86/kernel/cpu/common.c +1 -1
index cc25c2b..4df69a3 100644
@@ -839,7 +839,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 
 #ifdef CONFIG_X86_MCE
 	/* Init Machine Check Exception if available. */
-	mcheck_init(c);
+	mcheck_cpu_init(c);
 #endif
 
 	select_idle_routine(c);
arch/x86/kernel/cpu/mcheck/mce.c +26 -26

176 lines not on this page · raw message