Commit 33edbf02 authored Jun 15, 2009 by Hidetoshi Seto Committed by H. Peter Anvin Jun 16, 2009

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: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent 184e1fdf

arch/x86/kernel/cpu/mcheck/mce.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1617,7 +1617,8 @@ static int mce_resume(struct sys_device *dev)
		static void mce_cpu_restart(void *data)
		{
		del_timer_sync(&__get_cpu_var(mce_timer));
		if (mce_available(&current_cpu_data))
		if (!mce_available(&current_cpu_data))
		return;
		mce_init();
		mce_init_timer();
		}

Admin message