forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

watchdog: clean up some function names and arguments

Browse source 
Rename the update_timers*() functions to update_watchdog*().

Remove the boolean argument from watchdog_enable_all_cpus() because
update_watchdog_all_cpus() is now a generic function to change the run
state of the lockup detectors and to have the lockup detectors use a new
sample period.

Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ulrich Obergfell 2015-04-14 15:44:16 -07:00 • committed by Linus Torvalds
parent 195daf665a
commit b2f57c3a0d
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
kernel/watchdog.c
View file

@ -653,7 +653,7 @@ static void restart_watchdog_hrtimer(void *info)
HRTIMER_MODE_REL_PINNED); HRTIMER_MODE_REL_PINNED);
} }
static void update_timers(int cpu) static void update_watchdog(int cpu)
{ {
/* /*
* Make sure that perf event counter will adopt to a new * Make sure that perf event counter will adopt to a new
@ -668,17 +668,17 @@ static void update_timers(int cpu)
watchdog_nmi_enable(cpu); watchdog_nmi_enable(cpu);
} }
static void update_timers_all_cpus(void) static void update_watchdog_all_cpus(void)
{ {
int cpu; int cpu;
get_online_cpus(); get_online_cpus();
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
update_timers(cpu); update_watchdog(cpu);
put_online_cpus(); put_online_cpus();
} }
static int watchdog_enable_all_cpus(bool sample_period_changed) static int watchdog_enable_all_cpus(void)
{ {
int err = 0; int err = 0;
@ -688,8 +688,12 @@ static int watchdog_enable_all_cpus(bool sample_period_changed)
pr_err("Failed to create watchdog threads, disabled\n"); pr_err("Failed to create watchdog threads, disabled\n");
else else
watchdog_running = 1; watchdog_running = 1;
} else if (sample_period_changed) { } else {
update_timers_all_cpus(); /*
* Enable/disable the lockup detectors or
* change the sample period 'on the fly'.
*/
update_watchdog_all_cpus();
} }
return err; return err;
@ -721,7 +725,7 @@ static int proc_watchdog_update(void)
* or disabled 'on the fly'. * or disabled 'on the fly'.
*/ */
if (watchdog_enabled && watchdog_thresh) if (watchdog_enabled && watchdog_thresh)
err = watchdog_enable_all_cpus(true); err = watchdog_enable_all_cpus();
else else
watchdog_disable_all_cpus(); watchdog_disable_all_cpus();
@ -861,5 +865,5 @@ void __init lockup_detector_init(void)
set_sample_period(); set_sample_period();
if (watchdog_enabled) if (watchdog_enabled)
watchdog_enable_all_cpus(false); watchdog_enable_all_cpus();
} }