---

yaml --- r: 99822 b: refs/heads/master c: b8e0418 h: refs/heads/master v: v3
git-mirror · Jun 19, 2008 · 134512c · 134512c
1 parent d49adcc
commit 134512c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28638ea4f8adb63f837e4436560ab16ab0388587
+refs/heads/master: b8e0418b2a25f975c3b8764030c24b7253d33a68
diff --git a/trunk/arch/x86/kernel/nmi.c b/trunk/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;