From: Ulrich Obergfell <uobergfe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: dzickus@redhat.com, uobergfe@redhat.com
Subject: [PATCH v2 3/9] watchdog: move definition of 'watchdog_proc_mutex' outside of proc_dowatchdog()
Date: Fri, 17 Oct 2014 19:06:22 +0200 [thread overview]
Message-ID: <1413565588-4144-4-git-send-email-uobergfe@redhat.com> (raw)
In-Reply-To: <1413565588-4144-1-git-send-email-uobergfe@redhat.com>
This series removes the proc_dowatchdog() function. Since multiple
new functions need the 'watchdog_proc_mutex' to serialize access to
the watchdog parameters in /proc/sys/kernel, move the mutex outside
of any function.
Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
---
kernel/watchdog.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index da16a50..daf3b23 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -701,6 +701,8 @@ static int proc_watchdog_update(void)
}
+static DEFINE_MUTEX(watchdog_proc_mutex);
+
/*
* proc handler for /proc/sys/kernel/nmi_watchdog,watchdog_thresh
*/
@@ -710,7 +712,6 @@ int proc_dowatchdog(struct ctl_table *table, int write,
{
int err, old_thresh, old_enabled;
bool old_hardlockup;
- static DEFINE_MUTEX(watchdog_proc_mutex);
mutex_lock(&watchdog_proc_mutex);
old_thresh = ACCESS_ONCE(watchdog_thresh);
--
1.7.11.7
next prev parent reply other threads:[~2014-10-17 17:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-17 17:06 [PATCH v2 0/9] watchdog: parameters to control hard and soft lockup detector individually Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 1/9] watchdog: new definitions and variables, initialization Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 2/9] watchdog: introduce the proc_watchdog_update() function Ulrich Obergfell
2014-10-17 17:06 ` Ulrich Obergfell [this message]
2014-10-17 17:06 ` [PATCH v2 4/9] watchdog: introduce the proc_watchdog_common() function Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 5/9] watchdog: introduce separate handlers for parameters in /proc/sys/kernel Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 6/9] watchdog: implement error handling for failure to set up hardware perf events Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 7/9] watchdog: enable the new user interface of the watchdog mechanism Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 8/9] watchdog: clean up some function names and arguments Ulrich Obergfell
2014-10-17 17:06 ` [PATCH v2 9/9] watchdog: introduce the hardlockup_detector_disable() function Ulrich Obergfell
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=1413565588-4144-4-git-send-email-uobergfe@redhat.com \
--to=uobergfe@redhat.com \
--cc=dzickus@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/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).