Commit eea5b551 authored by Linus Torvalds's avatar 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
...@@ -1274,7 +1274,7 @@ static void mce_timer_fn(unsigned long data) ...@@ -1274,7 +1274,7 @@ static void mce_timer_fn(unsigned long data)
*/ */
iv = __this_cpu_read(mce_next_interval); iv = __this_cpu_read(mce_next_interval);
if (mce_notify_irq()) if (mce_notify_irq())
iv = max(iv, (unsigned long) HZ/100); iv = max(iv / 2, (unsigned long) HZ/100);
else else
iv = min(iv * 2, round_jiffies_relative(check_interval * HZ)); iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));
__this_cpu_write(mce_next_interval, iv); __this_cpu_write(mce_next_interval, iv);
......
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