Home » Mailing list archives » linux-kernel » 2008 » July » 7

[PATCH] [5/10] MCE: Rename mce_dont_init on 64bit to mce_disabled

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Andi Kleen
Subject: [PATCH] [5/10] MCE: Rename mce_dont_init on 64bit to mce_disabled
Date: Monday, July 7, 2008 - 4:10 pm

This way they are the same between 32bit and 64bit and no special
cases needed. The semantics were always the same.

Signed-off-by: Andi Kleen <ak@linux.intel.com>

---
 arch/x86/kernel/cpu/mcheck/mce_64.c |    8 ++++----
 include/asm-x86/mce.h               |    2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

Index: linux/arch/x86/kernel/cpu/mcheck/mce_64.c
===================================================================
--- linux.orig/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ linux/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -35,7 +35,7 @@
 
 atomic_t mce_entry;
 
-static int mce_dont_init;
+int mce_disabled __cpuinitdata;
 
 /*
  * Tolerant levels:
@@ -535,7 +535,7 @@ void __cpuinit mcheck_init(struct cpuinf
 
 	mce_cpu_quirks(c);
 
-	if (mce_dont_init ||
+	if (mce_disabled ||
 	    cpu_test_and_set(smp_processor_id(), mce_cpus) ||
 	    !mce_available(c))
 		return;
@@ -722,7 +722,7 @@ void __init restart_mce(void)
  */
 static int __init mcheck_disable(char *str)
 {
-	mce_dont_init = 1;
+	mce_disabled = 1;
 	return 1;
 }
 
@@ -734,7 +734,7 @@ static int __init mcheck_disable(char *s
 static int __init mcheck_enable(char *str)
 {
 	if (!strcmp(str, "off"))
-		mce_dont_init = 1;
+		mce_disabled = 1;
 	else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog"))
 		mce_bootlog = str[0] == 'b';
 	else if (isdigit(str[0]))
Index: linux/include/asm-x86/mce.h
===================================================================
--- linux.orig/include/asm-x86/mce.h
+++ linux/include/asm-x86/mce.h
@@ -84,9 +84,7 @@ struct mce_log {
 
 #ifdef __KERNEL__
 
-#ifdef CONFIG_X86_32
 extern int mce_disabled;
-#else /* CONFIG_X86_32 */
 
 #include <asm/atomic.h>
 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [0/10] Use 64bit x86 machine check code for 32bit ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [1/10] MCE: Make 64bit mce code 32bit clean v2, Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [2/10] MCE: Implement the PPro bank 0 quirk in the ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [3/10] MCE: Port K7 bank 0 quirk to 64bit mce code, Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [4/10] MCE: Call 64bit machine check through a cal ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [5/10] MCE: Rename mce_dont_init on 64bit to mce_d ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [6/10] MCE: Provide exit_idle dummy functions for ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [7/10] MCE: Remove machine check handler idle noti ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [8/10] MCE: Remove oops_begin() use in 64bit machi ..., Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [9/10] Add missing includes in mce_intel_64.c, Andi Kleen, (Mon Jul 7, 4:10 pm)
[PATCH] [10/10] MCE: Use 64bit machine check code on 32bit v2, Andi Kleen, (Mon Jul 7, 4:10 pm)
Re: [PATCH] [0/10] Use 64bit x86 machine check code for 32 ..., H. Peter Anvin, (Mon Jul 7, 4:53 pm)
Re: [PATCH] [0/10] Use 64bit x86 machine check code for 32 ..., Max Asbock, (Tue Jul 8, 12:54 pm)