This is a note to let you know that I've just added the patch titled
ntp: Remove unused tick_nsec
to the 6.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ntp-remove-unused-tick_nsec.patch
and it can be found in the queue-6.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 47820bd8951cecde2a46e794efb818bf82555ccc
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Wed Sep 11 15:17:37 2024 +0200
ntp: Remove unused tick_nsec
[ Upstream commit a849a0273d0f73a252d14d31c5003a8059ea51fc ]
tick_nsec is only updated in the NTP core, but there are no users.
Remove it.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Acked-by: John Stultz <jstultz@xxxxxxxxxx>
Link: https://lore.kernel.org/all/20240911-devel-anna-maria-b4-timers-ptp-ntp-v1-1-2d52f4e13476@xxxxxxxxxxxxx
Stable-dep-of: f5807b0606da ("ntp: Remove invalid cast in time offset math")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 7365dd4acffb6..23baf8c9b34ca 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -6,8 +6,6 @@
#include <linux/interrupt.h>
#include <linux/math64.h>
-#define TICK_SIZE (tick_nsec / 1000)
-
unsigned long long native_sched_clock(void);
extern void recalibrate_cpu_khz(void);
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 3871b06bd302c..7f7a12fd8200c 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -145,7 +145,6 @@ unsigned long random_get_entropy_fallback(void);
* estimated error = NTP dispersion.
*/
extern unsigned long tick_usec; /* USER_HZ period (usec) */
-extern unsigned long tick_nsec; /* SHIFTED_HZ period (nsec) */
/* Required to safely shift negative values */
#define shift_right(x, s) ({ \
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 802b336f4b8c2..c17cc9d857bc1 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -33,9 +33,6 @@
/* USER_HZ period (usecs): */
unsigned long tick_usec = USER_TICK_USEC;
-/* SHIFTED_HZ period (nsecs): */
-unsigned long tick_nsec;
-
static u64 tick_length;
static u64 tick_length_base;
@@ -253,8 +250,8 @@ static inline int ntp_synced(void)
*/
/*
- * Update (tick_length, tick_length_base, tick_nsec), based
- * on (tick_usec, ntp_tick_adj, time_freq):
+ * Update tick_length and tick_length_base, based on tick_usec, ntp_tick_adj and
+ * time_freq:
*/
static void ntp_update_frequency(void)
{
@@ -267,7 +264,6 @@ static void ntp_update_frequency(void)
second_length += ntp_tick_adj;
second_length += time_freq;
- tick_nsec = div_u64(second_length, HZ) >> NTP_SCALE_SHIFT;
new_base = div_u64(second_length, NTP_INTERVAL_FREQ);
/*
