Commit ef81e63e authored Jul 21, 2018 by Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Ingo Molnar:
 "A single fix for a MCE-polling regression, which prevented the
  disabling of polling"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/MCE: Remove min interval polling limitation

parents 43227e09 fbdb328c

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -2165,9 +2165,6 @@ static ssize_t store_int_with_restart(struct device *s,
		if (check_interval == old_check_interval)
		return ret;

		if (check_interval < 1)
		check_interval = 1;

		mutex_lock(&mce_sysfs_mutex);
		mce_restart();
		mutex_unlock(&mce_sysfs_mutex);