From: tip-bot for Mandeep Singh Baines <msb@chromium.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, msb@chromium.org, hpa@zytor.com,
mingo@redhat.com, a.p.zijlstra@chello.nl,
marcin.slusarz@gmail.com, fweisbec@gmail.com, tglx@linutronix.de,
mingo@elte.hu, dzickus@redhat.com
Subject: [tip:perf/urgent] watchdog: Only disable/enable watchdog if neccessary
Date: Mon, 23 May 2011 11:12:43 GMT [thread overview]
Message-ID: <tip-e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78@git.kernel.org> (raw)
In-Reply-To: <1306127423-3347-2-git-send-email-msb@chromium.org>
Commit-ID: e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78
Gitweb: http://git.kernel.org/tip/e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78
Author: Mandeep Singh Baines <msb@chromium.org>
AuthorDate: Sun, 22 May 2011 22:10:21 -0700
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 23 May 2011 11:58:58 +0200
watchdog: Only disable/enable watchdog if neccessary
Don't take any action on an unsuccessful write to /proc.
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1306127423-3347-2-git-send-email-msb@chromium.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/watchdog.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index a06972d..cf0e09f 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -507,15 +507,19 @@ static void watchdog_disable_all_cpus(void)
int proc_dowatchdog_enabled(struct ctl_table *table, int write,
void __user *buffer, size_t *length, loff_t *ppos)
{
- proc_dointvec(table, write, buffer, length, ppos);
+ int ret;
- if (write) {
- if (watchdog_enabled)
- watchdog_enable_all_cpus();
- else
- watchdog_disable_all_cpus();
- }
- return 0;
+ ret = proc_dointvec(table, write, buffer, length, ppos);
+ if (ret || !write)
+ goto out;
+
+ if (watchdog_enabled)
+ watchdog_enable_all_cpus();
+ else
+ watchdog_disable_all_cpus();
+
+out:
+ return ret;
}
int proc_dowatchdog_thresh(struct ctl_table *table, int write,
next prev parent reply other threads:[~2011-05-23 11:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-23 5:10 [PATCH 1/4] watchdog: fix rounding issues in get_sample_period() Mandeep Singh Baines
2011-05-23 5:10 ` [PATCH 2/4] watchdog: only disable/enable watchdog if neccessary Mandeep Singh Baines
2011-05-23 11:12 ` tip-bot for Mandeep Singh Baines [this message]
2011-05-23 5:10 ` [PATCH 3/4] watchdog: disable watchdog when thresh is zero Mandeep Singh Baines
2011-05-23 5:10 ` [PATCH 4/4] watchdog: configure nmi watchdog period based on watchdog_thresh Mandeep Singh Baines
2011-05-23 11:12 ` [tip:perf/urgent] watchdog: Fix rounding bug in get_sample_period() tip-bot for Mandeep Singh Baines
-- strict thread matches above, loose matches on Subject: below --
2011-05-24 3:41 linux-next: build warning in Lunus' tree Stephen Rothwell
2011-05-16 23:34 [PATCH 1/4] watchdog: fix rounding issues in get_sample_period() Mandeep Singh Baines
2011-05-16 23:34 ` [PATCH 2/4] watchdog: only disable/enable watchdog if neccessary Mandeep Singh Baines
2011-05-16 23:35 ` [PATCH 3/4] watchdog: disable watchdog when thresh is zero Mandeep Singh Baines
2011-05-17 7:10 ` Ingo Molnar
2011-05-18 3:36 ` [PATCH 3/4 v2] " Mandeep Singh Baines
2011-05-18 8:35 ` Ingo Molnar
2011-05-19 16:20 ` [PATCH 3/4 v3] " Mandeep Singh Baines
2011-05-23 11:13 ` [tip:perf/urgent] watchdog: Disable " tip-bot for Mandeep Singh Baines
2011-05-16 23:35 ` [PATCH 4/4] watchdog: configure nmi watchdog period based on watchdog_thresh Mandeep Singh Baines
2011-05-17 7:16 ` Ingo Molnar
2011-05-17 14:03 ` Don Zickus
2011-05-17 18:47 ` Ingo Molnar
2011-05-18 3:44 ` [PATCH 4/4 v2] " Mandeep Singh Baines
2011-05-18 8:39 ` Ingo Molnar
2011-05-18 13:51 ` Don Zickus
2011-05-23 11:13 ` [tip:perf/urgent] watchdog: Change the default timeout and " tip-bot for Mandeep Singh Baines
2011-05-24 3:58 ` [tip:perf/urgent] watchdog: Fix non-standard prototype of get_softlockup_thresh() tip-bot for Ingo Molnar
2011-05-18 13:53 ` [PATCH 1/4] watchdog: fix rounding issues in get_sample_period() Don Zickus
2011-05-19 16:26 ` Mandeep Singh Baines
2011-05-20 11:51 ` Ingo Molnar
2011-05-23 5:14 ` Mandeep Singh Baines
2011-06-09 11:47 ` Don Zickus
2011-06-09 14:51 ` Mandeep Singh Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-e04ab2bc41b35c0cb6cdb07c8443f91aa738cf78@git.kernel.org \
--to=msb@chromium.org \
--cc=a.p.zijlstra@chello.nl \
--cc=dzickus@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=marcin.slusarz@gmail.com \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).