x86/mce: Set up timer unconditionally
authorJan Beulich <jbeulich@novell.com>
Tue, 8 Dec 2009 02:21:37 +0000 (11:21 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Dec 2009 22:03:42 +0000 (14:03 -0800)
commite8aab284380017e1aee419ab45e87d89eff8cf00
tree3f6330b4089b9d56ad1b275d03edd2e37a72fc1c
parent05217134d25f399adb7bb3db195e7dc64ad77289
x86/mce: Set up timer unconditionally

commit bc09effabf0c5c6c7021e5ef9af15a23579b32a8 upstream.

mce_timer must be passed to setup_timer() in all cases, no
matter whether it is going to be actually used. Otherwise, when
the CPU gets brought down, its call to del_timer_sync() will
never return, as the timer won't have a base associated, and
hence lock_timer_base() will loop infinitely.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
LKML-Reference: <4B1DB831.2030801@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/kernel/cpu/mcheck/mce.c