From 46dec760974e325c21a8f6d74093ddbd2caddc3c Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Thu, 3 Dec 2009 11:33:08 +0900
Subject: [PATCH] --- yaml --- r: 173087 b: refs/heads/master c:
 fe5ed91ddce85a0ed0e4f92c10b099873ef62167 h: refs/heads/master i:   173085:
 c63b5c58331c768c2e5be37b190509cd244652f5   173083:
 38c9be047c233c97c37aedf110e6568c1637cd5e   173079:
 54521ad1cefc662a7cf35f43ff5ef4994b271afa   173071:
 8c57fe07a3d6c8db803566f3ca7c8b1466b52e75   173055:
 eb9301b082fe444cdb28a86c418eb8af59bbae0e v: v3

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

diff --git a/[refs] b/[refs]
index 26340f8f65d9..432a810c5773 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8b7d791a8ff01d2380089279a69afa99115fb23
+refs/heads/master: fe5ed91ddce85a0ed0e4f92c10b099873ef62167
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
index 721a77ca8115..4825a3d6eb40 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1991,9 +1991,11 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 		break;
 	case CPU_DOWN_FAILED:
 	case CPU_DOWN_FAILED_FROZEN:
-		t->expires = round_jiffies(jiffies +
+		if (!mce_ignore_ce && check_interval) {
+			t->expires = round_jiffies(jiffies +
 					   __get_cpu_var(mce_next_interval));
-		add_timer_on(t, cpu);
+			add_timer_on(t, cpu);
+		}
 		smp_call_function_single(cpu, mce_reenable_cpu, &action, 1);
 		break;
 	case CPU_POST_DEAD: