diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-21 17:25:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-21 17:25:49 -0700 |
| commit | ef81e63e17ab34cea26f24b951188d16143efc92 (patch) | |
| tree | 6939c4ddf12295e38fd332c8b89085444c3a4c92 | |
| parent | Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/MCE: Remove min interval polling limitation (diff) | |
| download | linux-dev-ef81e63e17ab34cea26f24b951188d16143efc92.tar.xz linux-dev-ef81e63e17ab34cea26f24b951188d16143efc92.zip | |
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
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index c102ad51025e..8c50754c09c1 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -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); |