ASoC: ak4642: Remove CLK_IS_ROOT

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

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 969e6704c3c9a24754d0da31e0dd028257425ddd..084b79f5917e5faa8e8ffc768387ef7011fe94d5 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -378,7 +378,7 @@ static int __init tick_nohz_full_setup(char *str)
 {
        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");
+               pr_warn("NO_HZ: Incorrect nohz_full cpumask\n");
                free_bootmem_cpumask_var(tick_nohz_full_mask);
                return 1;
        }
@@ -446,8 +446,7 @@ void __init tick_nohz_init(void)
         * interrupts to avoid circular dependency on the tick
         */
        if (!arch_irq_work_has_interrupt()) {
-               pr_warning("NO_HZ: Can't run full dynticks because arch doesn't "
-                          "support irq work self-IPIs\n");
+               pr_warn("NO_HZ: Can't run full dynticks because arch doesn't support irq work self-IPIs\n");
                cpumask_clear(tick_nohz_full_mask);
                cpumask_copy(housekeeping_mask, cpu_possible_mask);
                tick_nohz_full_running = false;
@@ -457,7 +456,8 @@ void __init tick_nohz_init(void)
        cpu = smp_processor_id();
 
        if (cpumask_test_cpu(cpu, tick_nohz_full_mask)) {
-               pr_warning("NO_HZ: Clearing %d from nohz_full range for timekeeping\n", cpu);
+               pr_warn("NO_HZ: Clearing %d from nohz_full range for timekeeping\n",
+                       cpu);
                cpumask_clear_cpu(cpu, tick_nohz_full_mask);
        }
 
@@ -486,20 +486,14 @@ void __init tick_nohz_init(void)
 /*
  * NO HZ enabled ?
  */
-int tick_nohz_enabled __read_mostly = 1;
+bool tick_nohz_enabled __read_mostly  = true;
 unsigned long tick_nohz_active  __read_mostly;
 /*
  * Enable / Disable tickless mode
  */
 static int __init setup_tick_nohz(char *str)
 {
-       if (!strcmp(str, "off"))
-               tick_nohz_enabled = 0;
-       else if (!strcmp(str, "on"))
-               tick_nohz_enabled = 1;
-       else
-               return 0;
-       return 1;
+       return (kstrtobool(str, &tick_nohz_enabled) == 0);
 }
 
 __setup("nohz=", setup_tick_nohz);