summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-06-16 19:59:08 -0300
committerIngo Molnar <mingo@elte.hu>2008-06-19 11:59:11 +0200
commitb8e0418b2a25f975c3b8764030c24b7253d33a68 (patch)
tree8b08889447f8c37fbc3ca43db911a816c0c49055 /arch/x86
parent28638ea4f8adb63f837e4436560ab16ab0388587 (diff)
downloadblackbird-obmc-linux-b8e0418b2a25f975c3b8764030c24b7253d33a68.tar.gz
blackbird-obmc-linux-b8e0418b2a25f975c3b8764030c24b7253d33a68.zip
x86: fix typo CONFIX -> CONFIG
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/nmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 326a8f4f50f8..fd680c73ba77 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -68,7 +68,7 @@ static inline unsigned int get_nmi_count(int cpu)
static inline int mce_in_progress(void)
{
-#if defined(CONFIX_X86_64) && defined(CONFIG_X86_MCE)
+#if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE)
return atomic_read(&mce_entry) > 0;
#endif
return 0;
OpenPOWER on IntegriCloud