---

yaml --- r: 163039 b: refs/heads/master c: e3346fc h: refs/heads/master i: 163037: 32f1d8e 163035: c25b5ff 163031: a722d9c 163023: 4c2008e 163007: 21b9d1b v: v3
git-mirror · Jul 29, 2009 · 3452d30 · 3452d30
1 parent 75f2207
commit 3452d30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94699b04eddd4b247d871930431d6fa1a46c175e
+refs/heads/master: e3346fc48204d780f92527d06df8bf6f28d603ec
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1549,8 +1549,10 @@ static struct miscdevice mce_log_device = {
  */
 static int __init mcheck_enable(char *str)
 {
-	if (*str == 0)
+	if (*str == 0) {
 		enable_p5_mce();
+		return 1;
+	}
 	if (*str == '=')
 		str++;
 	if (!strcmp(str, "off"))