[PATCH 8/9] watchdog: clean up some function names and arguments

From: Don Zickus
Date: Tue Nov 04 2014 - 11:22:46 EST


From: Ulrich Obergfell <uobergfe@xxxxxxxxxx>

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@xxxxxxxxxx>
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
---
kernel/watchdog.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 7043274..e804ea4 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -641,7 +641,7 @@ static void restart_watchdog_hrtimer(void *info)
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
@@ -656,17 +656,17 @@ static void update_timers(int cpu)
watchdog_nmi_enable(cpu);
}

-static void update_timers_all_cpus(void)
+static void update_watchdog_all_cpus(void)
{
int cpu;

get_online_cpus();
for_each_online_cpu(cpu)
- update_timers(cpu);
+ update_watchdog(cpu);
put_online_cpus();
}

-static int watchdog_enable_all_cpus(bool sample_period_changed)
+static int watchdog_enable_all_cpus(void)
{
int err = 0;

@@ -676,8 +676,12 @@ static int watchdog_enable_all_cpus(bool sample_period_changed)
pr_err("Failed to create watchdog threads, disabled\n");
else
watchdog_running = 1;
- } else if (sample_period_changed) {
- update_timers_all_cpus();
+ } else {
+ /*
+ * Enable/disable the lockup detectors or
+ * change the sample period 'on the fly'.
+ */
+ update_watchdog_all_cpus();
}

return err;
@@ -709,7 +713,7 @@ static int proc_watchdog_update(void)
* or disabled 'on the fly'.
*/
if (watchdog_enabled && watchdog_thresh)
- err = watchdog_enable_all_cpus(true);
+ err = watchdog_enable_all_cpus();
else
watchdog_disable_all_cpus();

@@ -849,5 +853,5 @@ void __init lockup_detector_init(void)
set_sample_period();

if (watchdog_enabled)
- watchdog_enable_all_cpus(false);
+ watchdog_enable_all_cpus();
}
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/