Commitff00673

KAGA-KOKO

authored and

Ingo Molnar

committed

timers/nohz: Remove pointless tick_nohz_kick_tick() function

This was a failed attempt to optimize the timer expiry in idle, which wasdisabled and never revisited. Remove the cruft.Signed-off-by: Thomas Gleixner <tglx@linutronix.de>Cc: Arjan van de Ven <arjan@infradead.org>Cc: Chris Mason <clm@fb.com>Cc: Eric Dumazet <edumazet@google.com>Cc: Frederic Weisbecker <fweisbec@gmail.com>Cc: George Spelvin <linux@sciencehorizons.net>Cc: Josh Triplett <josh@joshtriplett.org>Cc: Len Brown <lenb@kernel.org>Cc: Linus Torvalds <torvalds@linux-foundation.org>Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>Cc: Peter Zijlstra <peterz@infradead.org>Cc: Rik van Riel <riel@redhat.com>Cc: rt@linutronix.deLink:http://lkml.kernel.org/r/20160704094342.431073782@linutronix.deSigned-off-by: Ingo Molnar <mingo@kernel.org>

1 parent2369683 commitff00673Copy full SHA for ff00673

File tree

1 file changed

-32

lines changed

kernel/time
- tick-sched.c

1 file changed

-32

lines changed

`‎kernel/time/tick-sched.c‎`

Lines changed: 1 addition & 32 deletions

Original file line number	Diff line number	Diff line change
`@@ -1092,35 +1092,6 @@ static void tick_nohz_switch_to_nohz(void)`
`1092`	`1092`	`tick_nohz_activate(ts,NOHZ_MODE_LOWRES);`
`1093`	`1093`	`}`
`1094`	`1094`
`1095`		`-/*`
`1096`		`- * When NOHZ is enabled and the tick is stopped, we need to kick the`
`1097`		`- * tick timer from irq_enter() so that the jiffies update is kept`
`1098`		`- * alive during long running softirqs. That's ugly as hell, but`
`1099`		`- * correctness is key even if we need to fix the offending softirq in`
`1100`		`- * the first place.`
`1101`		`- *`
`1102`		`- * Note, this is different to tick_nohz_restart. We just kick the`
`1103`		`- * timer and do not touch the other magic bits which need to be done`
`1104`		`- * when idle is left.`
`1105`		`- */`
`1106`		`-staticvoidtick_nohz_kick_tick(structtick_sched*ts,ktime_tnow)`
`1107`		`-{`
`1108`		`-#if0`
`1109`		`-/* Switch back to 2.6.27 behaviour */`
`1110`		`-ktime_tdelta;`
`1111`		`-`
`1112`		`-/*`
`1113`		`- * Do not touch the tick device, when the next expiry is either`
`1114`		`- * already reached or less/equal than the tick period.`
`1115`		`- */`
`1116`		`-delta=ktime_sub(hrtimer_get_expires(&ts->sched_timer),now);`
`1117`		`-if (delta.tv64 <=tick_period.tv64)`
`1118`		`-return;`
`1119`		`-`
`1120`		`-tick_nohz_restart(ts,now);`
`1121`		`-#endif`
`1122`		`-}`
`1123`		`-`
`1124`	`1095`	`staticinlinevoidtick_nohz_irq_enter(void)`
`1125`	`1096`	`{`
`1126`	`1097`	`structtick_sched*ts=this_cpu_ptr(&tick_cpu_sched);`
`@@ -1131,10 +1102,8 @@ static inline void tick_nohz_irq_enter(void)`
`1131`	`1102`	`now=ktime_get();`
`1132`	`1103`	`if (ts->idle_active)`
`1133`	`1104`	`tick_nohz_stop_idle(ts,now);`
`1134`		`-if (ts->tick_stopped) {`
	`1105`	`+if (ts->tick_stopped)`
`1135`	`1106`	`tick_nohz_update_jiffies(now);`
`1136`		`-tick_nohz_kick_tick(ts,now);`
`1137`		`-}`
`1138`	`1107`	`}`
`1139`	`1108`
`1140`	`1109`	`#else`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitff00673

File tree

1 file changed

1 file changed

`‎kernel/time/tick-sched.c‎`

0 commit comments