get_target_base() in the timer code is not using the "base" parameter at all. My gut feeling is that instead of removing that extra parameter, what we really want to do is "return the old base if it does not suite for a new one".
CC: Thomas Gleixner <[email protected]> CC: John Stultz <[email protected]> CC: Stephen Boyd <[email protected]> CC: Luiz Capitulino <[email protected]> CC: Marcelo Tosatti <[email protected]> CC: [email protected] Signed-off-by: Peter Xu <[email protected]> --- kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 343c7ba33b1c..6ff6ffd2c719 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -868,7 +868,7 @@ get_target_base(struct timer_base *base, unsigned tflags) !(tflags & TIMER_PINNED)) return get_timer_cpu_base(tflags, get_nohz_timer_target()); #endif - return get_timer_this_cpu_base(tflags); + return base; } static inline void forward_timer_base(struct timer_base *base) -- 2.17.1
