summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/mce.h
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2009-04-28 22:50:19 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-05-28 09:24:12 -0700
commit04b2b1a4df6cd0fdaa598f3c623a19c2d93cb48a (patch)
tree5fb8d2619fd24cc2ec3314c3610a0c45cd4fef05 /arch/x86/include/asm/mce.h
parent5d7279268b654d1f8ac43b0eb6cd9598d9cf55fd (diff)
x86, mce: rename 64bit mce_dont_init to mce_disabled
Give it the same name as on 32bit. This makes further merging easier. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/mce.h')
-rw-r--r--arch/x86/include/asm/mce.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 94aedaf6327f..c3c7ee701753 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -86,9 +86,7 @@ struct mce_log {
#ifdef __KERNEL__
-#ifdef CONFIG_X86_32
extern int mce_disabled;
-#endif
#include <asm/atomic.h>