Skip to content

Commit eea5b55

Browse files
committed
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
2 parents ecc7284 + c2238f1 commit eea5b55

File tree

1 file changed

+1
-1
lines changed
  • arch/x86/kernel/cpu/mcheck

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ static void mce_timer_fn(unsigned long data)
12741274
*/
12751275
iv = __this_cpu_read(mce_next_interval);
12761276
if (mce_notify_irq())
1277-
iv = max(iv, (unsigned long) HZ/100);
1277+
iv = max(iv / 2, (unsigned long) HZ/100);
12781278
else
12791279
iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));
12801280
__this_cpu_write(mce_next_interval, iv);

0 commit comments

Comments
 (0)