From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Thu, 3 Dec 2009 02:33:08 +0000 (+0900)
Subject: x86, mce: don't restart timer if disabled
X-Git-Tag: v2.6.33-rc1~369^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe5ed91ddce85a0ed0e4f92c10b099873ef62167;p=pandora-kernel.git

x86, mce: don't restart timer if disabled

Even it is in error path unlikely taken, add_timer_on() at
CPU_DOWN_FAILED* needs to be skipped if mce_timer is disabled.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: <stable@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

Reading git-diff-tree failed