summaryrefslogtreecommitdiffstats
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/watchdog.c')
-rw-r--r--kernel/watchdog.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 5a93d4c446b8..41e0f7e9fa35 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -998,6 +998,7 @@ static int proc_watchdog_common(int which, const struct ctl_table *table, int wr
mutex_lock(&watchdog_mutex);
+ old = *param;
if (!write) {
/*
* On read synchronize the userspace interface. This is a
@@ -1005,8 +1006,8 @@ static int proc_watchdog_common(int which, const struct ctl_table *table, int wr
*/
*param = (watchdog_enabled & which) != 0;
err = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
+ *param = old;
} else {
- old = READ_ONCE(*param);
err = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
if (!err && old != READ_ONCE(*param))
proc_watchdog_update();
w=1'>[PATCH] queue last_merge hint cleanupJens Axboe2-5/+10 2002-10-27[PATCH] queue dma alignmentJens Axboe2-0/+34 2002-10-27[PATCH] make queue prep_rq_fn() a bit more powerfulJens Axboe2-13/+28 2002-10-27[PATCH] make blk_dump_rq_flags a bit more usefulJens Axboe1-3/+15 2002-10-27[PATCH] elv_add_request cleanupsJens Axboe5-28/+30 2002-10-27[PATCH] sr_ioctl must return -EIO, not -EINVALJens Axboe1-4/+2 2002-10-27[PATCH] end_io bouncingJens Axboe3-36/+46 2002-10-27[PATCH] make deadline_merge prefetch next entryJens Axboe1-0/+6 2002-10-27[PATCH] use correct wakeups in fs/pipe.cManfred Spraul1-2/+2 2002-10-27Use pci_[gs]et_drvdata instead of directly referenced ->driver_dataAdam J. Richter6-16/+16 2002-10-26Add PCI id to tulip net driverJun Komuro1-0/+1 2002-10-26Small clarification in BK kernel howtoJeff Garzik1-1/+1