The following commit has been merged into the timers/core branch of tip:
Commit-ID: a849a0273d0f73a252d14d31c5003a8059ea51fc
Gitweb: https://git.kernel.org/tip/a849a0273d0f73a252d14d31c5003a8059ea51fc
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Wed, 11 Sep 2024 15:17:37 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Wed, 02 Oct 2024 16:53:38 +02:00
ntp: Remove unused tick_nsec
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
---
arch/x86/include/asm/timer.h | 2 --
include/linux/timex.h | 1 -
kernel/time/ntp.c | 8 ++------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 7365dd4..23baf8c 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 3871b06..7f7a12f 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 802b336..c17cc9d 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);
/*
|