Skip to content

Commit

Permalink
tick/sched: Remove useless oneshot ifdeffery
Browse files Browse the repository at this point in the history
tick-sched.c is only built when CONFIG_TICK_ONESHOT=y, which is selected
only if CONFIG_NO_HZ_COMMON=y or CONFIG_HIGH_RES_TIMERS=y. Therefore
the related ifdeferry in this file is needless and can be removed.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240225225508.11587-4-frederic@kernel.org
  • Loading branch information
Frederic Weisbecker authored and Thomas Gleixner committed Feb 26, 2024
1 parent 37263ba commit 3aedb7f
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions kernel/time/tick-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ struct tick_sched *tick_get_tick_sched(int cpu)
return &per_cpu(tick_cpu_sched, cpu);
}

#if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)
/*
* The time when the last jiffy update happened. Write access must hold
* jiffies_lock and jiffies_seq. tick_nohz_next_event() needs to get a
Expand Down Expand Up @@ -289,7 +288,6 @@ static enum hrtimer_restart tick_nohz_handler(struct hrtimer *timer)

return HRTIMER_RESTART;
}
#endif

#ifdef CONFIG_NO_HZ_FULL
cpumask_var_t tick_nohz_full_mask;
Expand Down Expand Up @@ -635,7 +633,7 @@ void __init tick_nohz_init(void)
pr_info("NO_HZ: Full dynticks CPUs: %*pbl.\n",
cpumask_pr_args(tick_nohz_full_mask));
}
#endif
#endif /* #ifdef CONFIG_NO_HZ_FULL */

/*
* NOHZ - aka dynamic tick functionality
Expand Down Expand Up @@ -1540,7 +1538,6 @@ void tick_irq_enter(void)
tick_nohz_irq_enter();
}

#if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
static int sched_skew_tick;

static int __init skew_tick(char *str)
Expand Down Expand Up @@ -1605,7 +1602,6 @@ void tick_cancel_sched_timer(int cpu)
ts->idle_calls = idle_calls;
ts->idle_sleeps = idle_sleeps;
}
#endif /* CONFIG_NO_HZ_COMMON || CONFIG_HIGH_RES_TIMERS */

/*
* Async notification about clocksource changes
Expand Down

0 comments on commit 3aedb7f

Please sign in to comment.