The patch titled
Subject: watchdog: move definition of 'watchdog_proc_mutex' outside of proc_dowatchdog()
has been removed from the -mm tree. Its filename was
watchdog-move-definition-of-watchdog_proc_mutex-outside-of-proc_dowatchdog.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Subject: 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: Ulrich Obergfell <uobergfe@xxxxxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN kernel/watchdog.c~watchdog-move-definition-of-watchdog_proc_mutex-outside-of-proc_dowatchdog kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-move-definition-of-watchdog_proc_mutex-outside-of-proc_dowatchdog
+++ a/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 *ta
{
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);
_
Patches currently in -mm which might be from uobergfe@xxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
