timers: Rename NEXT_TIMER_MAX_DELTA as TIMER_NEXT_MAX_DELTA

Move this macro to the canonical TIMER_* namespace.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-7-mingo@kernel.org

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 6a4805968966caf0cd3748b76b405a237d1ea16c..791d1942a0581ebf63bce6d9dbeb7ea22bf69484 100644 (file)
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -572,7 +572,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
 
 /*
  * Return the number of jiffies until the next timeout.  If the timeout is
- * longer than the NEXT_TIMER_MAX_DELTA, then return NEXT_TIMER_MAX_DELTA
+ * longer than the TIMER_NEXT_MAX_DELTA, then return TIMER_NEXT_MAX_DELTA
  * because the larger value can break the timer APIs.
  */
 static unsigned long watchdog_next_timeout(struct kvm_vcpu *vcpu)
@@ -598,7 +598,7 @@ static unsigned long watchdog_next_timeout(struct kvm_vcpu *vcpu)
        if (do_div(nr_jiffies, tb_ticks_per_jiffy))
                nr_jiffies++;
 
-       return min_t(unsigned long long, nr_jiffies, NEXT_TIMER_MAX_DELTA);
+       return min_t(unsigned long long, nr_jiffies, TIMER_NEXT_MAX_DELTA);
 }
 
 static void arm_next_watchdog(struct kvm_vcpu *vcpu)
@@ -616,10 +616,10 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu)
        spin_lock_irqsave(&vcpu->arch.wdt_lock, flags);
        nr_jiffies = watchdog_next_timeout(vcpu);
        /*
-        * If the number of jiffies of watchdog timer >= NEXT_TIMER_MAX_DELTA
+        * If the number of jiffies of watchdog timer >= TIMER_NEXT_MAX_DELTA
         * then do not run the watchdog timer as this can break timer APIs.
         */
-       if (nr_jiffies < NEXT_TIMER_MAX_DELTA)
+       if (nr_jiffies < TIMER_NEXT_MAX_DELTA)
                mod_timer(&vcpu->arch.wdt_timer, jiffies + nr_jiffies);
        else
                timer_delete(&vcpu->arch.wdt_timer);

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 4e1237ff4b246ac91886b14baff49bcdc4f799cd..68cf8e28bbe0e468d660e9ec5c2ef87b3a800ee6 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -156,7 +156,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);
  * The jiffies value which is added to now, when there is no timer
  * in the timer wheel:
  */
-#define NEXT_TIMER_MAX_DELTA   ((1UL << 30) - 1)
+#define TIMER_NEXT_MAX_DELTA   ((1UL << 30) - 1)
 
 extern void add_timer(struct timer_list *timer);
 extern void add_timer_local(struct timer_list *timer);

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 6f520e5f548b64fd315724dcee1558304709fdfc..11c6a11a35699d76719c444dcf3fec78082a716a 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1900,7 +1900,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
        unsigned long clk, next, adj;
        unsigned lvl, offset = 0;
 
-       next = base->clk + NEXT_TIMER_MAX_DELTA;
+       next = base->clk + TIMER_NEXT_MAX_DELTA;
        clk = base->clk;
        for (lvl = 0; lvl < LVL_DEPTH; lvl++, offset += LVL_SIZE) {
                int pos = next_pending_bucket(base, offset, clk & LVL_MASK);
@@ -1963,7 +1963,7 @@ static void timer_recalc_next_expiry(struct timer_base *base)
 
        WRITE_ONCE(base->next_expiry, next);
        base->next_expiry_recalc = false;
-       base->timers_pending = !(next == base->clk + NEXT_TIMER_MAX_DELTA);
+       base->timers_pending = !(next == base->clk + TIMER_NEXT_MAX_DELTA);
 }
 
 #ifdef CONFIG_NO_HZ_COMMON
@@ -2015,7 +2015,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
         * easy comparable to find out which base holds the first pending timer.
         */
        if (!base->timers_pending)
-               WRITE_ONCE(base->next_expiry, basej + NEXT_TIMER_MAX_DELTA);
+               WRITE_ONCE(base->next_expiry, basej + TIMER_NEXT_MAX_DELTA);
 
        return base->next_expiry;
 }
@@ -2399,7 +2399,7 @@ static inline void __run_timers(struct timer_base *base)
                 * timer at this clk are that all matching timers have been
                 * dequeued or no timer has been queued since
                 * base::next_expiry was set to base::clk +
-                * NEXT_TIMER_MAX_DELTA.
+                * TIMER_NEXT_MAX_DELTA.
                 */
                WARN_ON_ONCE(!levels && !base->next_expiry_recalc
                             && base->timers_pending);
@@ -2544,7 +2544,7 @@ int timers_prepare_cpu(unsigned int cpu)
        for (b = 0; b < NR_BASES; b++) {
                base = per_cpu_ptr(&timer_bases[b], cpu);
                base->clk = jiffies;
-               base->next_expiry = base->clk + NEXT_TIMER_MAX_DELTA;
+               base->next_expiry = base->clk + TIMER_NEXT_MAX_DELTA;
                base->next_expiry_recalc = false;
                base->timers_pending = false;
                base->is_idle = false;
@@ -2599,7 +2599,7 @@ static void __init init_timer_cpu(int cpu)
                base->cpu = cpu;
                raw_spin_lock_init(&base->lock);
                base->clk = jiffies;
-               base->next_expiry = base->clk + NEXT_TIMER_MAX_DELTA;
+               base->next_expiry = base->clk + TIMER_NEXT_MAX_DELTA;
                timer_base_init_expiry_lock(base);
        }
 }