nohz: Rename a few state variables

[karo-tx-linux.git] / kernel / time / tick-sched.c

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 91a2528b5f44c8600da227ad05c054d5226c2996..b28dee43e64492bd364884d2de425ed300e8ecb9 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -149,8 +149,8 @@ static void tick_sched_handle(struct tick_sched *ts, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_NO_HZ_FULL
-static cpumask_var_t nohz_full_mask;
-bool have_nohz_full_mask;
+static cpumask_var_t tick_nohz_full_mask;
+bool tick_nohz_full_running;
 
 static bool can_stop_full_tick(void)
 {
@@ -183,7 +183,7 @@ static bool can_stop_full_tick(void)
                 * Don't allow the user to think they can get
                 * full NO_HZ with this machine.
                 */
-               WARN_ONCE(have_nohz_full_mask,
+               WARN_ONCE(tick_nohz_full_running,
                          "NO_HZ FULL will not work with unstable sched clock");
                return false;
        }
@@ -240,11 +240,11 @@ static void nohz_full_kick_ipi(void *info)
  */
 void tick_nohz_full_kick_all(void)
 {
-       if (!have_nohz_full_mask)
+       if (!tick_nohz_full_running)
                return;
 
        preempt_disable();
-       smp_call_function_many(nohz_full_mask,
+       smp_call_function_many(tick_nohz_full_mask,
                               nohz_full_kick_ipi, NULL, false);
        preempt_enable();
 }
@@ -272,10 +272,10 @@ out:
 
 int tick_nohz_full_cpu(int cpu)
 {
-       if (!have_nohz_full_mask)
+       if (!tick_nohz_full_running)
                return 0;
 
-       return cpumask_test_cpu(cpu, nohz_full_mask);
+       return cpumask_test_cpu(cpu, tick_nohz_full_mask);
 }
 
 /* Parse the boot-time nohz CPU list from the kernel parameters. */
@@ -283,18 +283,18 @@ static int __init tick_nohz_full_setup(char *str)
 {
        int cpu;
 
-       alloc_bootmem_cpumask_var(&nohz_full_mask);
-       if (cpulist_parse(str, nohz_full_mask) < 0) {
+       alloc_bootmem_cpumask_var(&tick_nohz_full_mask);
+       if (cpulist_parse(str, tick_nohz_full_mask) < 0) {
                pr_warning("NOHZ: Incorrect nohz_full cpumask\n");
                return 1;
        }
 
        cpu = smp_processor_id();
-       if (cpumask_test_cpu(cpu, nohz_full_mask)) {
+       if (cpumask_test_cpu(cpu, tick_nohz_full_mask)) {
                pr_warning("NO_HZ: Clearing %d from nohz_full range for timekeeping\n", cpu);
-               cpumask_clear_cpu(cpu, nohz_full_mask);
+               cpumask_clear_cpu(cpu, tick_nohz_full_mask);
        }
-       have_nohz_full_mask = true;
+       tick_nohz_full_running = true;
 
        return 1;
 }
@@ -312,7 +312,7 @@ static int tick_nohz_cpu_down_callback(struct notifier_block *nfb,
                 * If we handle the timekeeping duty for full dynticks CPUs,
                 * we can't safely shutdown that CPU.
                 */
-               if (have_nohz_full_mask && tick_do_timer_cpu == cpu)
+               if (tick_nohz_full_running && tick_do_timer_cpu == cpu)
                        return NOTIFY_BAD;
                break;
        }
@@ -331,14 +331,14 @@ static int tick_nohz_init_all(void)
        int err = -1;
 
 #ifdef CONFIG_NO_HZ_FULL_ALL
-       if (!alloc_cpumask_var(&nohz_full_mask, GFP_KERNEL)) {
+       if (!alloc_cpumask_var(&tick_nohz_full_mask, GFP_KERNEL)) {
                pr_err("NO_HZ: Can't allocate full dynticks cpumask\n");
                return err;
        }
        err = 0;
-       cpumask_setall(nohz_full_mask);
-       cpumask_clear_cpu(smp_processor_id(), nohz_full_mask);
-       have_nohz_full_mask = true;
+       cpumask_setall(tick_nohz_full_mask);
+       cpumask_clear_cpu(smp_processor_id(), tick_nohz_full_mask);
+       tick_nohz_full_running = true;
 #endif
        return err;
 }
@@ -347,20 +347,20 @@ void __init tick_nohz_init(void)
 {
        int cpu;
 
-       if (!have_nohz_full_mask) {
+       if (!tick_nohz_full_running) {
                if (tick_nohz_init_all() < 0)
                        return;
        }
 
-       for_each_cpu(cpu, nohz_full_mask)
+       for_each_cpu(cpu, tick_nohz_full_mask)
                context_tracking_cpu_set(cpu);
 
        cpu_notifier(tick_nohz_cpu_down_callback, 0);
-       cpulist_scnprintf(nohz_full_buf, sizeof(nohz_full_buf), nohz_full_mask);
+       cpulist_scnprintf(nohz_full_buf, sizeof(nohz_full_buf), tick_nohz_full_mask);
        pr_info("NO_HZ: Full dynticks CPUs: %s.\n", nohz_full_buf);
 }
 #else
-#define have_nohz_full_mask (0)
+#define tick_nohz_full_running (0)
 #endif
 
 /*
@@ -738,7 +738,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
                return false;
        }
 
-       if (have_nohz_full_mask) {
+       if (tick_nohz_full_running) {
                /*
                 * Keep the tick alive to guarantee timekeeping progression
                 * if there are full dynticks CPUs around