A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

watchdog/core: Rename watchdog_proc_mutex

Browse source 
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 <[email protected]>
Reviewed-by: Don Zickus <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Chris Metcalf <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Nicholas Piggin <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Sebastian Siewior <[email protected]>
Cc: Ulrich Obergfell <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Thomas Gleixner 2017-09-12 21:37:01 +02:00 • committed by Ingo Molnar
commit 946d197794
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/watchdog.c
View file

@ -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;
}