@@ -1900,7 +1900,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
1900
1900
unsigned long clk , next , adj ;
1901
1901
unsigned lvl , offset = 0 ;
1902
1902
1903
- next = base -> clk + NEXT_TIMER_MAX_DELTA ;
1903
+ next = base -> clk + TIMER_NEXT_MAX_DELTA ;
1904
1904
clk = base -> clk ;
1905
1905
for (lvl = 0 ; lvl < LVL_DEPTH ; lvl ++ , offset += LVL_SIZE ) {
1906
1906
int pos = next_pending_bucket (base , offset , clk & LVL_MASK );
@@ -1963,7 +1963,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
1963
1963
1964
1964
WRITE_ONCE (base -> next_expiry , next );
1965
1965
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 );
1967
1967
}
1968
1968
1969
1969
#ifdef CONFIG_NO_HZ_COMMON
@@ -2015,7 +2015,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
2015
2015
* easy comparable to find out which base holds the first pending timer.
2016
2016
*/
2017
2017
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 );
2019
2019
2020
2020
return base -> next_expiry ;
2021
2021
}
@@ -2399,7 +2399,7 @@ static inline void __run_timers(struct timer_base *base)
2399
2399
* timer at this clk are that all matching timers have been
2400
2400
* dequeued or no timer has been queued since
2401
2401
* base::next_expiry was set to base::clk +
2402
- * NEXT_TIMER_MAX_DELTA .
2402
+ * TIMER_NEXT_MAX_DELTA .
2403
2403
*/
2404
2404
WARN_ON_ONCE (!levels && !base -> next_expiry_recalc
2405
2405
&& base -> timers_pending );
@@ -2544,7 +2544,7 @@ int timers_prepare_cpu(unsigned int cpu)
2544
2544
for (b = 0 ; b < NR_BASES ; b ++ ) {
2545
2545
base = per_cpu_ptr (& timer_bases [b ], cpu );
2546
2546
base -> clk = jiffies ;
2547
- base -> next_expiry = base -> clk + NEXT_TIMER_MAX_DELTA ;
2547
+ base -> next_expiry = base -> clk + TIMER_NEXT_MAX_DELTA ;
2548
2548
base -> next_expiry_recalc = false;
2549
2549
base -> timers_pending = false;
2550
2550
base -> is_idle = false;
@@ -2599,7 +2599,7 @@ static void __init init_timer_cpu(int cpu)
2599
2599
base -> cpu = cpu ;
2600
2600
raw_spin_lock_init (& base -> lock );
2601
2601
base -> clk = jiffies ;
2602
- base -> next_expiry = base -> clk + NEXT_TIMER_MAX_DELTA ;
2602
+ base -> next_expiry = base -> clk + TIMER_NEXT_MAX_DELTA ;
2603
2603
timer_base_init_expiry_lock (base );
2604
2604
}
2605
2605
}
0 commit comments