Commit 33edbf02 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by H. Peter Anvin

x86, mce: don't init timer if !mce_available

In mce_cpu_restart, mce_init_timer is called unconditionally.
If !mce_available (e.g. mce is disabled), there are no useful work
for timer.  Stop running it.
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 184e1fdf
...@@ -1617,8 +1617,9 @@ static int mce_resume(struct sys_device *dev) ...@@ -1617,8 +1617,9 @@ static int mce_resume(struct sys_device *dev)
static void mce_cpu_restart(void *data) static void mce_cpu_restart(void *data)
{ {
del_timer_sync(&__get_cpu_var(mce_timer)); del_timer_sync(&__get_cpu_var(mce_timer));
if (mce_available(&current_cpu_data)) if (!mce_available(&current_cpu_data))
mce_init(); return;
mce_init();
mce_init_timer(); mce_init_timer();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment