| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Mon, 4 Jul 2016 09:50:35 +0000 |
| Subject: [PATCH 18/22] tick/sched: Remove pointless empty function |
| |
| This was a failed attempt to optimize the timer expiry in idle, which was |
| disabled and never revisited. Remove the cruft. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Frederic Weisbecker <fweisbec@gmail.com> |
| Cc: Chris Mason <clm@fb.com> |
| Cc: Eric Dumazet <edumazet@google.com> |
| Cc: rt@linutronix.de |
| Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> |
| Cc: Arjan van de Ven <arjan@infradead.org> |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| kernel/time/tick-sched.c | 33 +-------------------------------- |
| 1 file changed, 1 insertion(+), 32 deletions(-) |
| |
| --- a/kernel/time/tick-sched.c |
| +++ b/kernel/time/tick-sched.c |
| @@ -1091,35 +1091,6 @@ static void tick_nohz_switch_to_nohz(voi |
| tick_nohz_activate(ts, NOHZ_MODE_LOWRES); |
| } |
| |
| -/* |
| - * When NOHZ is enabled and the tick is stopped, we need to kick the |
| - * tick timer from irq_enter() so that the jiffies update is kept |
| - * alive during long running softirqs. That's ugly as hell, but |
| - * correctness is key even if we need to fix the offending softirq in |
| - * the first place. |
| - * |
| - * Note, this is different to tick_nohz_restart. We just kick the |
| - * timer and do not touch the other magic bits which need to be done |
| - * when idle is left. |
| - */ |
| -static void tick_nohz_kick_tick(struct tick_sched *ts, ktime_t now) |
| -{ |
| -#if 0 |
| - /* Switch back to 2.6.27 behaviour */ |
| - ktime_t delta; |
| - |
| - /* |
| - * Do not touch the tick device, when the next expiry is either |
| - * already reached or less/equal than the tick period. |
| - */ |
| - delta = ktime_sub(hrtimer_get_expires(&ts->sched_timer), now); |
| - if (delta.tv64 <= tick_period.tv64) |
| - return; |
| - |
| - tick_nohz_restart(ts, now); |
| -#endif |
| -} |
| - |
| static inline void tick_nohz_irq_enter(void) |
| { |
| struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched); |
| @@ -1130,10 +1101,8 @@ static inline void tick_nohz_irq_enter(v |
| now = ktime_get(); |
| if (ts->idle_active) |
| tick_nohz_stop_idle(ts, now); |
| - if (ts->tick_stopped) { |
| + if (ts->tick_stopped) |
| tick_nohz_update_jiffies(now); |
| - tick_nohz_kick_tick(ts, now); |
| - } |
| } |
| |
| #else |