From nobody Sun Feb 8 10:19:37 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D61A28DB7C for ; Wed, 7 May 2025 17:53:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746640439; cv=none; b=AVl5dy7q6UPpZdL4n0u0HUYd8SVEcgd3Ku7ZHNkpl/mpMdi5zKl0txW0cTaSiDvW71vPZtFSyhYSpXRluCwN79D2BRlPlmBqPeun/bMOwFdhVs76wZKMb8Egu9giDdHG1iImA4F7rctWCIpBpFdj2gqw+FFxIEXbjVXZfMjXnt0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746640439; c=relaxed/simple; bh=HC1KsU4z9WlnZu7yHjh+oP59xPMa7irEGs5KLUzO1rQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VVjyXo99yl9eM72enexJSb3ncK9pZq4otVWWrw7r7owpO1xMnRVfNAcgRPNeKMgIjDdMfWFI3LlYl6cf4Y5EmG2bMIPu/V8vilOVd7lFST7CQYLJ8chr7SnAQA7Xp4u32yareJeg0KJaWO3iSRZqo14RPd3/ZAERW2EIVPEnpt4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pFgeXEsk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pFgeXEsk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0CFBC4CEE2; Wed, 7 May 2025 17:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746640438; bh=HC1KsU4z9WlnZu7yHjh+oP59xPMa7irEGs5KLUzO1rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pFgeXEskE8cW+T00FoqsED2gYU5mJ67B3xzWonaVmYrk3xdTiVu8XadpkGSuBJ4oc LxiMPmtYG4+GLmDTC9vS+U5ktfFRf53U1VsHlbNvQiOnLcBplLK2GnwO8eNXaYqjtU ERMmGBRnWfwt+OL+sLFoQjfMsX8kbFA0yOC5YF3ZUNo0BYR8yqWo2EF3Xi0ay5EnTZ yjmj8UN3GGl+2WAt/Ha7PeM2wytNnQvOKl75cWKTla1IM9h1D1CkKy+x98342wcWPo /RIpba1ZF2gs8IDNMss2uZJlHj2m0bDC0VSEEshVp7v+ovS6nKdqRaM/LQLT3ek6oh fBiMFZ8DaiZjg== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Frederic Weisbecker , "H . Peter Anvin" , Linus Torvalds , Peter Zijlstra , Ingo Molnar Subject: [PATCH 06/10] timers: Rename NEXT_TIMER_MAX_DELTA => TIMER_NEXT_MAX_DELTA Date: Wed, 7 May 2025 19:53:34 +0200 Message-ID: <20250507175338.672442-7-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250507175338.672442-1-mingo@kernel.org> References: <20250507175338.672442-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move this macro to the canonical TIMER_* namespace. Signed-off-by: Ingo Molnar --- arch/powerpc/kvm/booke.c | 8 ++++---- include/linux/timer.h | 2 +- kernel/time/timer.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 6a4805968966..791d1942a058 100644 --- 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, =20 /* * 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_v= cpu *vcpu) if (do_div(nr_jiffies, tb_ticks_per_jiffy)) nr_jiffies++; =20 - return min_t(unsigned long long, nr_jiffies, NEXT_TIMER_MAX_DELTA); + return min_t(unsigned long long, nr_jiffies, TIMER_NEXT_MAX_DELTA); } =20 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 =3D watchdog_next_timeout(vcpu); /* - * If the number of jiffies of watchdog timer >=3D NEXT_TIMER_MAX_DELTA + * If the number of jiffies of watchdog timer >=3D 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 4e1237ff4b24..68cf8e28bbe0 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -156,7 +156,7 @@ extern int timer_reduce(struct timer_list *timer, unsig= ned 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) =20 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 6f520e5f548b..11c6a11a3569 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1900,7 +1900,7 @@ static void timer_recalc_next_expiry(struct timer_bas= e *base) unsigned long clk, next, adj; unsigned lvl, offset =3D 0; =20 - next =3D base->clk + NEXT_TIMER_MAX_DELTA; + next =3D base->clk + TIMER_NEXT_MAX_DELTA; clk =3D base->clk; for (lvl =3D 0; lvl < LVL_DEPTH; lvl++, offset +=3D LVL_SIZE) { int pos =3D next_pending_bucket(base, offset, clk & LVL_MASK); @@ -1963,7 +1963,7 @@ static void timer_recalc_next_expiry(struct timer_bas= e *base) =20 WRITE_ONCE(base->next_expiry, next); base->next_expiry_recalc =3D false; - base->timers_pending =3D !(next =3D=3D base->clk + NEXT_TIMER_MAX_DELTA); + base->timers_pending =3D !(next =3D=3D base->clk + TIMER_NEXT_MAX_DELTA); } =20 #ifdef CONFIG_NO_HZ_COMMON @@ -2015,7 +2015,7 @@ static unsigned long next_timer_interrupt(struct time= r_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); =20 return base->next_expiry; } @@ -2399,7 +2399,7 @@ static inline void __run_timers(struct timer_base *ba= se) * 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 =3D 0; b < NR_BASES; b++) { base =3D per_cpu_ptr(&timer_bases[b], cpu); base->clk =3D jiffies; - base->next_expiry =3D base->clk + NEXT_TIMER_MAX_DELTA; + base->next_expiry =3D base->clk + TIMER_NEXT_MAX_DELTA; base->next_expiry_recalc =3D false; base->timers_pending =3D false; base->is_idle =3D false; @@ -2599,7 +2599,7 @@ static void __init init_timer_cpu(int cpu) base->cpu =3D cpu; raw_spin_lock_init(&base->lock); base->clk =3D jiffies; - base->next_expiry =3D base->clk + NEXT_TIMER_MAX_DELTA; + base->next_expiry =3D base->clk + TIMER_NEXT_MAX_DELTA; timer_base_init_expiry_lock(base); } } --=20 2.45.2