projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op
[linux-2.6-block.git]
/
kernel
/
watchdog.c
diff --git
a/kernel/watchdog.c
b/kernel/watchdog.c
index b3ace6ebbba3934ca52b6e5a6e420183da233fdc..9acb29f280ec95813612a913307e4dcaec8b7e03 100644
(file)
--- a/
kernel/watchdog.c
+++ b/
kernel/watchdog.c
@@
-923,6
+923,9
@@
static int proc_watchdog_common(int which, struct ctl_table *table, int write,
* both lockup detectors are disabled if proc_watchdog_update()
* returns an error.
*/
* both lockup detectors are disabled if proc_watchdog_update()
* returns an error.
*/
+ if (old == new)
+ goto out;
+
err = proc_watchdog_update();
}
out:
err = proc_watchdog_update();
}
out:
@@
-967,7
+970,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 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
;
get_online_cpus();
mutex_lock(&watchdog_proc_mutex);
get_online_cpus();
mutex_lock(&watchdog_proc_mutex);
@@
-987,6
+990,10
@@
int proc_watchdog_thresh(struct ctl_table *table, int write,
/*
* Update the sample period. Restore on failure.
*/
/*
* Update the sample period. Restore on failure.
*/
+ new = ACCESS_ONCE(watchdog_thresh);
+ if (old == new)
+ goto out;
+
set_sample_period();
err = proc_watchdog_update();
if (err) {
set_sample_period();
err = proc_watchdog_update();
if (err) {