| commit | 05217134d25f399adb7bb3db195e7dc64ad77289 | |
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | |
| Thu, 3 Dec 2009 02:33:08 +0000 (3 11:33 +0900) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Fri, 18 Dec 2009 22:03:41 +0000 (18 14:03 -0800) | ||
| tree | e85044cd8bb26f0321d777222eef3198e8615825 | treesnapshot (tar.gz zip) |
| parent | ceb9c79365c6eb4971effbb28c118874ae83410e | commitdiff |
x86, mce: don't restart timer if disabled
commit fe5ed91ddce85a0ed0e4f92c10b099873ef62167 upstream.
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>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fe5ed91ddce85a0ed0e4f92c10b099873ef62167 upstream.
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>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| arch/x86/kernel/cpu/mcheck/mce.c | diffblobblamehistory |