Commit f54c2274 authored by Ulrich Obergfell's avatar Ulrich Obergfell Committed by Linus Torvalds

watchdog: move definition of 'watchdog_proc_mutex' outside of proc_dowatchdog()

This series removes proc_dowatchdog().  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: default avatarUlrich Obergfell <uobergfe@redhat.com>
Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0c9cbb9
...@@ -701,6 +701,8 @@ static int proc_watchdog_update(void) ...@@ -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 * proc handler for /proc/sys/kernel/nmi_watchdog,watchdog_thresh
*/ */
...@@ -710,7 +712,6 @@ int proc_dowatchdog(struct ctl_table *table, int write, ...@@ -710,7 +712,6 @@ int proc_dowatchdog(struct ctl_table *table, int write,
{ {
int err, old_thresh, old_enabled; int err, old_thresh, old_enabled;
bool old_hardlockup; bool old_hardlockup;
static DEFINE_MUTEX(watchdog_proc_mutex);
mutex_lock(&watchdog_proc_mutex); mutex_lock(&watchdog_proc_mutex);
old_thresh = ACCESS_ONCE(watchdog_thresh); old_thresh = ACCESS_ONCE(watchdog_thresh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment