@@ -1900,7 +1900,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
19001900 unsigned long clk , next , adj ;
19011901 unsigned lvl , offset = 0 ;
19021902
1903- next = base -> clk + NEXT_TIMER_MAX_DELTA ;
1903+ next = base -> clk + TIMER_NEXT_MAX_DELTA ;
19041904 clk = base -> clk ;
19051905 for (lvl = 0 ; lvl < LVL_DEPTH ; lvl ++ , offset += LVL_SIZE ) {
19061906 int pos = next_pending_bucket (base , offset , clk & LVL_MASK );
@@ -1963,7 +1963,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
19631963
19641964 WRITE_ONCE (base -> next_expiry , next );
19651965 base -> next_expiry_recalc = false;
1966- base -> timers_pending = !(next == base -> clk + NEXT_TIMER_MAX_DELTA );
1966+ base -> timers_pending = !(next == base -> clk + TIMER_NEXT_MAX_DELTA );
19671967}
19681968
19691969#ifdef CONFIG_NO_HZ_COMMON
@@ -2015,7 +2015,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
20152015 * easy comparable to find out which base holds the first pending timer.
20162016 */
20172017 if (!base -> timers_pending )
2018- WRITE_ONCE (base -> next_expiry , basej + NEXT_TIMER_MAX_DELTA );
2018+ WRITE_ONCE (base -> next_expiry , basej + TIMER_NEXT_MAX_DELTA );
20192019
20202020 return base -> next_expiry ;
20212021}
@@ -2399,7 +2399,7 @@ static inline void __run_timers(struct timer_base *base)
23992399 * timer at this clk are that all matching timers have been
24002400 * dequeued or no timer has been queued since
24012401 * base::next_expiry was set to base::clk +
2402- * NEXT_TIMER_MAX_DELTA .
2402+ * TIMER_NEXT_MAX_DELTA .
24032403 */
24042404 WARN_ON_ONCE (!levels && !base -> next_expiry_recalc
24052405 && base -> timers_pending );
@@ -2544,7 +2544,7 @@ int timers_prepare_cpu(unsigned int cpu)
25442544 for (b = 0 ; b < NR_BASES ; b ++ ) {
25452545 base = per_cpu_ptr (& timer_bases [b ], cpu );
25462546 base -> clk = jiffies ;
2547- base -> next_expiry = base -> clk + NEXT_TIMER_MAX_DELTA ;
2547+ base -> next_expiry = base -> clk + TIMER_NEXT_MAX_DELTA ;
25482548 base -> next_expiry_recalc = false;
25492549 base -> timers_pending = false;
25502550 base -> is_idle = false;
@@ -2599,7 +2599,7 @@ static void __init init_timer_cpu(int cpu)
25992599 base -> cpu = cpu ;
26002600 raw_spin_lock_init (& base -> lock );
26012601 base -> clk = jiffies ;
2602- base -> next_expiry = base -> clk + NEXT_TIMER_MAX_DELTA ;
2602+ base -> next_expiry = base -> clk + TIMER_NEXT_MAX_DELTA ;
26032603 timer_base_init_expiry_lock (base );
26042604 }
26052605}
0 commit comments