summaryrefslogtreecommitdiffstats
path: root/kernel/watchdog.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-09-12 21:37:01 +0200
committerIngo Molnar <mingo@kernel.org>2017-09-14 11:41:04 +0200
commit946d197794b23202b8b46c43016747c72fe23393 (patch)
treea92bb9797deb55787575ce426952b38fbfb448e3 /kernel/watchdog.c
parentb7a349819d4b9b5db64e523351e66a79a758eaa5 (diff)
downloadlinux-stable-946d197794b23202b8b46c43016747c72fe23393.tar.gz
linux-stable-946d197794b23202b8b46c43016747c72fe23393.tar.bz2
linux-stable-946d197794b23202b8b46c43016747c72fe23393.zip
watchdog/core: Rename watchdog_proc_mutex
Following patches will use the mutex for other purposes as well. Rename it as it is not longer a proc specific thing. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Don Zickus <dzickus@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Chris Metcalf <cmetcalf@mellanox.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Ulrich Obergfell <uobergfe@redhat.com> Link: http://lkml.kernel.org/r/20170912194146.647714850@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/watchdog.c')
-rw-r--r--kernel/watchdog.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index cd79f644ea34..7c3a0a76b41b 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -29,8 +29,7 @@
#include <linux/kvm_para.h>
#include <linux/kthread.h>
-/* Watchdog configuration */
-static DEFINE_MUTEX(watchdog_proc_mutex);
+static DEFINE_MUTEX(watchdog_mutex);
int __read_mostly nmi_watchdog_enabled;
@@ -704,7 +703,7 @@ static int proc_watchdog_common(int which, struct ctl_table *table, int write,
int *watchdog_param = (int *)table->data;
cpu_hotplug_disable();
- mutex_lock(&watchdog_proc_mutex);
+ mutex_lock(&watchdog_mutex);
/*
* If the parameter is being read return the state of the corresponding
@@ -751,7 +750,7 @@ static int proc_watchdog_common(int which, struct ctl_table *table, int write,
err = proc_watchdog_update();
}
out:
- mutex_unlock(&watchdog_proc_mutex);
+ mutex_unlock(&watchdog_mutex);
cpu_hotplug_enable();
return err;
}
@@ -795,7 +794,7 @@ int proc_watchdog_thresh(struct ctl_table *table, int write,
int err, old, new;
cpu_hotplug_disable();
- mutex_lock(&watchdog_proc_mutex);
+ mutex_lock(&watchdog_mutex);
old = ACCESS_ONCE(watchdog_thresh);
err = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
@@ -817,7 +816,7 @@ int proc_watchdog_thresh(struct ctl_table *table, int write,
set_sample_period();
}
out:
- mutex_unlock(&watchdog_proc_mutex);
+ mutex_unlock(&watchdog_mutex);
cpu_hotplug_enable();
return err;
}
@@ -834,7 +833,7 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write,
int err;
cpu_hotplug_disable();
- mutex_lock(&watchdog_proc_mutex);
+ mutex_lock(&watchdog_mutex);
err = proc_do_large_bitmap(table, write, buffer, lenp, ppos);
if (!err && write) {
@@ -855,7 +854,7 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write,
watchdog_nmi_reconfigure();
}
- mutex_unlock(&watchdog_proc_mutex);
+ mutex_unlock(&watchdog_mutex);
cpu_hotplug_enable();
return err;
}