Commit eea5b551 authored Jun 05, 2012 by Linus Torvalds

Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull MCE regression fix from Tony Luck:
 "Typo/thinko in a cleanup caused a semantic change. Fix it."

* tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  x86/mce: Fix the MCE poll timer logic

parents ecc72846 c2238f10

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1274,7 +1274,7 @@ static void mce_timer_fn(unsigned long data)
		*/
		iv = __this_cpu_read(mce_next_interval);
		if (mce_notify_irq())
		iv = max(iv, (unsigned long) HZ/100);
		iv = max(iv / 2, (unsigned long) HZ/100);
		else
		iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));
		__this_cpu_write(mce_next_interval, iv);