diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:43:36 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:43:36 +0800 |
commit | 9beee7af111a7afa5f7b787daaf8a6891c05f216 (patch) | |
tree | 92fdbea807b9ef2917d1f087355f08617230dd75 /kernel/watchdog.c | |
parent | e8490c42825967752fef08dddf37eb3f5f34d753 (diff) | |
parent | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (diff) |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.04-android
Conflicts:
keep -fno-pic flag in arch/arm64/Makefile
Diffstat (limited to 'kernel/watchdog.c')
-rw-r--r-- | kernel/watchdog.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 21a61f836736..0b4a50300590 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -925,6 +925,9 @@ static int proc_watchdog_common(int which, struct ctl_table *table, int write, * Update the run state of the lockup detectors. * Restore 'watchdog_enabled' on failure. */ + if (old == new) + goto out; + err = proc_watchdog_update(); if (err) watchdog_enabled = old; @@ -970,7 +973,7 @@ int proc_soft_watchdog(struct ctl_table *table, int write, int proc_watchdog_thresh(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { - int err, old; + int err, old, new; mutex_lock(&watchdog_proc_mutex); @@ -984,6 +987,10 @@ int proc_watchdog_thresh(struct ctl_table *table, int write, * Update the sample period. * Restore 'watchdog_thresh' on failure. */ + new = ACCESS_ONCE(watchdog_thresh); + if (old == new) + goto out; + set_sample_period(); err = proc_watchdog_update(); if (err) |