From 3452d3018998e8326463289142ead641ba9c18b5 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 28 Jul 2009 23:55:09 +0200
Subject: [PATCH] --- yaml --- r: 163039 b: refs/heads/master c:
 e3346fc48204d780f92527d06df8bf6f28d603ec h: refs/heads/master i:   163037:
 32f1d8e93b1a341239ccf611b99d231a174761d8   163035:
 c25b5ff89dd9ea15662d4c01a6574dd62b587a9c   163031:
 a722d9c207333dd31f571d69265e1dfadc921250   163023:
 4c2008ecc01b3029d87eae6556f91409912a7921   163007:
 21b9d1ba1c6bd76ee630481364e2cce7651510c4 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 86d0f1778a23..d7947daf49ce 100644
--- 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
index 7bd19c7f5315..75919440a188 100644
--- 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"))