drop timekeeping patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 4a4e79d844ada015159dc9e2fc702ada28604be3..ca734c4ea899b9d6146ca8d6d7494e67daca55a2 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -380,7 +380,6 @@ s390-cpum_sf-handle-cpu-hotplug-remove-during-sampli.patch
 btrfs-avoid-unnecessary-device-path-update-for-the-s.patch
 kselftest-arm64-don-t-leak-pipe-fds-in-pac.exec_sign.patch
 kcsan-turn-report_filterlist_lock-into-a-raw_spinloc.patch
-timekeeping-always-check-for-negative-motion.patch
 media-uvcvideo-add-a-quirk-for-the-kaiweets-kti-w02-.patch
 media-cx231xx-add-support-for-dexatek-usb-video-grab.patch
 drm-vc4-hvs-set-axi-panic-modes-for-the-hvs.patch

diff --git a/queue-5.10/timekeeping-always-check-for-negative-motion.patch b/queue-5.10/timekeeping-always-check-for-negative-motion.patch
deleted file mode 100644 (file)
index 140e0ce..0000000
--- a/queue-5.10/timekeeping-always-check-for-negative-motion.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 59ad16489d20ac31cf65b9e39cd6541a102f9643 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:04:08 +0100
-Subject: timekeeping: Always check for negative motion
-
-From: Thomas Gleixner <tglx@linutronix.de>
-
-[ Upstream commit c163e40af9b2331b2c629fd4ec8b703ed4d4ae39 ]
-
-clocksource_delta() has two variants. One with a check for negative motion,
-which is only selected by x86. This is a historic leftover as this function
-was previously used in the time getter hot paths.
-
-Since 135225a363ae timekeeping_cycles_to_ns() has unconditional protection
-against this as a by-product of the protection against 64bit math overflow.
-
-clocksource_delta() is only used in the clocksource watchdog and in
-timekeeping_advance(). The extra conditional there is not hurting anyone.
-
-Remove the config option and unconditionally prevent negative motion of the
-readout.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Acked-by: John Stultz <jstultz@google.com>
-Link: https://lore.kernel.org/all/20241031120328.599430157@linutronix.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/Kconfig                   | 1 -
- kernel/time/Kconfig                | 5 -----
- kernel/time/timekeeping_internal.h | 7 -------
- 3 files changed, 13 deletions(-)
-
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 0c802ade80406..e71101ced756e 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -107,7 +107,6 @@ config X86
-       select ARCH_WANTS_THP_SWAP              if X86_64
-       select BUILDTIME_TABLE_SORT
-       select CLKEVT_I8253
--      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
-       select CLOCKSOURCE_WATCHDOG
-       select DCACHE_WORD_ACCESS
-       select EDAC_ATOMIC_SCRUB
-diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
-index a09b1d61df6a5..5cbedc0a06efc 100644
---- a/kernel/time/Kconfig
-+++ b/kernel/time/Kconfig
-@@ -17,11 +17,6 @@ config ARCH_CLOCKSOURCE_DATA
- config ARCH_CLOCKSOURCE_INIT
-       bool
- 
--# Clocksources require validation of the clocksource against the last
--# cycle update - x86/TSC misfeature
--config CLOCKSOURCE_VALIDATE_LAST_CYCLE
--      bool
--
- # Timekeeping vsyscall support
- config GENERIC_TIME_VSYSCALL
-       bool
-diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
-index 4ca2787d1642e..1d4854d5c386e 100644
---- a/kernel/time/timekeeping_internal.h
-+++ b/kernel/time/timekeeping_internal.h
-@@ -15,7 +15,6 @@ extern void tk_debug_account_sleep_time(const struct timespec64 *t);
- #define tk_debug_account_sleep_time(x)
- #endif
- 
--#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
- static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
- {
-       u64 ret = (now - last) & mask;
-@@ -26,12 +25,6 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
-        */
-       return ret & ~(mask >> 1) ? 0 : ret;
- }
--#else
--static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
--{
--      return (now - last) & mask;
--}
--#endif
- 
- /* Semi public for serialization of non timekeeper VDSO updates. */
- extern raw_spinlock_t timekeeper_lock;
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 7aa2ab64cbc14eb7080fb41b3c2f5be06fbef465..ed517d3f0efd7e779f892fe9c0880dcea7a949f7 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -471,7 +471,6 @@ s390-cpum_sf-handle-cpu-hotplug-remove-during-sampli.patch
 btrfs-avoid-unnecessary-device-path-update-for-the-s.patch
 kselftest-arm64-don-t-leak-pipe-fds-in-pac.exec_sign.patch
 kcsan-turn-report_filterlist_lock-into-a-raw_spinloc.patch
-timekeeping-always-check-for-negative-motion.patch
 media-uvcvideo-add-a-quirk-for-the-kaiweets-kti-w02-.patch
 media-cx231xx-add-support-for-dexatek-usb-video-grab.patch
 soc-imx8m-probe-the-soc-driver-as-platform-driver.patch

diff --git a/queue-5.15/timekeeping-always-check-for-negative-motion.patch b/queue-5.15/timekeeping-always-check-for-negative-motion.patch
deleted file mode 100644 (file)
index 3e40fe3..0000000
--- a/queue-5.15/timekeeping-always-check-for-negative-motion.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 61e06b4cbff342e89623c619fc868746fe74ca2c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:04:08 +0100
-Subject: timekeeping: Always check for negative motion
-
-From: Thomas Gleixner <tglx@linutronix.de>
-
-[ Upstream commit c163e40af9b2331b2c629fd4ec8b703ed4d4ae39 ]
-
-clocksource_delta() has two variants. One with a check for negative motion,
-which is only selected by x86. This is a historic leftover as this function
-was previously used in the time getter hot paths.
-
-Since 135225a363ae timekeeping_cycles_to_ns() has unconditional protection
-against this as a by-product of the protection against 64bit math overflow.
-
-clocksource_delta() is only used in the clocksource watchdog and in
-timekeeping_advance(). The extra conditional there is not hurting anyone.
-
-Remove the config option and unconditionally prevent negative motion of the
-readout.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Acked-by: John Stultz <jstultz@google.com>
-Link: https://lore.kernel.org/all/20241031120328.599430157@linutronix.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/Kconfig                   | 1 -
- kernel/time/Kconfig                | 5 -----
- kernel/time/timekeeping_internal.h | 7 -------
- 3 files changed, 13 deletions(-)
-
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 2f6312e7ce81f..8bb3cb5d655ff 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -124,7 +124,6 @@ config X86
-       select ARCH_HAS_PARANOID_L1D_FLUSH
-       select BUILDTIME_TABLE_SORT
-       select CLKEVT_I8253
--      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
-       select CLOCKSOURCE_WATCHDOG
-       select DCACHE_WORD_ACCESS
-       select EDAC_ATOMIC_SCRUB
-diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
-index 04bfd62f5e5ca..d9eb6892367e5 100644
---- a/kernel/time/Kconfig
-+++ b/kernel/time/Kconfig
-@@ -17,11 +17,6 @@ config ARCH_CLOCKSOURCE_DATA
- config ARCH_CLOCKSOURCE_INIT
-       bool
- 
--# Clocksources require validation of the clocksource against the last
--# cycle update - x86/TSC misfeature
--config CLOCKSOURCE_VALIDATE_LAST_CYCLE
--      bool
--
- # Timekeeping vsyscall support
- config GENERIC_TIME_VSYSCALL
-       bool
-diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
-index 4ca2787d1642e..1d4854d5c386e 100644
---- a/kernel/time/timekeeping_internal.h
-+++ b/kernel/time/timekeeping_internal.h
-@@ -15,7 +15,6 @@ extern void tk_debug_account_sleep_time(const struct timespec64 *t);
- #define tk_debug_account_sleep_time(x)
- #endif
- 
--#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
- static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
- {
-       u64 ret = (now - last) & mask;
-@@ -26,12 +25,6 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
-        */
-       return ret & ~(mask >> 1) ? 0 : ret;
- }
--#else
--static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
--{
--      return (now - last) & mask;
--}
--#endif
- 
- /* Semi public for serialization of non timekeeper VDSO updates. */
- extern raw_spinlock_t timekeeper_lock;
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index dcae87856d5f70a863fa955515c8fb8c26be4dbc..2edd8490331d7a828aa76eb7b8e7f0c5178656a1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -262,7 +262,6 @@ dma-buf-fix-dma_fence_array_signaled-v4.patch
 regmap-detach-regmap-from-dev-on-regmap_exit.patch
 mmc-core-further-prevent-card-detect-during-shutdown.patch
 s390-cpum_sf-handle-cpu-hotplug-remove-during-sampli.patch
-timekeeping-always-check-for-negative-motion.patch
 media-uvcvideo-add-a-quirk-for-the-kaiweets-kti-w02-.patch
 media-cx231xx-add-support-for-dexatek-usb-video-grab.patch
 drm-panel-orientation-quirks-add-quirk-for-aya-neo-2.patch

diff --git a/queue-5.4/timekeeping-always-check-for-negative-motion.patch b/queue-5.4/timekeeping-always-check-for-negative-motion.patch
deleted file mode 100644 (file)
index f4807f9..0000000
--- a/queue-5.4/timekeeping-always-check-for-negative-motion.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From a6188d33b7a5ea1f492ad8a52645e5698698ba38 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:04:08 +0100
-Subject: timekeeping: Always check for negative motion
-
-From: Thomas Gleixner <tglx@linutronix.de>
-
-[ Upstream commit c163e40af9b2331b2c629fd4ec8b703ed4d4ae39 ]
-
-clocksource_delta() has two variants. One with a check for negative motion,
-which is only selected by x86. This is a historic leftover as this function
-was previously used in the time getter hot paths.
-
-Since 135225a363ae timekeeping_cycles_to_ns() has unconditional protection
-against this as a by-product of the protection against 64bit math overflow.
-
-clocksource_delta() is only used in the clocksource watchdog and in
-timekeeping_advance(). The extra conditional there is not hurting anyone.
-
-Remove the config option and unconditionally prevent negative motion of the
-readout.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Acked-by: John Stultz <jstultz@google.com>
-Link: https://lore.kernel.org/all/20241031120328.599430157@linutronix.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/Kconfig                   | 1 -
- kernel/time/Kconfig                | 5 -----
- kernel/time/timekeeping_internal.h | 7 -------
- 3 files changed, 13 deletions(-)
-
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index df0a3a1b08ae0..a3e7f75a8cfa8 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -99,7 +99,6 @@ config X86
-       select ARCH_WANTS_THP_SWAP              if X86_64
-       select BUILDTIME_EXTABLE_SORT
-       select CLKEVT_I8253
--      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
-       select CLOCKSOURCE_WATCHDOG
-       select DCACHE_WORD_ACCESS
-       select EDAC_ATOMIC_SCRUB
-diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
-index fcc42353f1253..4b9a8653a6327 100644
---- a/kernel/time/Kconfig
-+++ b/kernel/time/Kconfig
-@@ -17,11 +17,6 @@ config ARCH_CLOCKSOURCE_DATA
- config ARCH_CLOCKSOURCE_INIT
-       bool
- 
--# Clocksources require validation of the clocksource against the last
--# cycle update - x86/TSC misfeature
--config CLOCKSOURCE_VALIDATE_LAST_CYCLE
--      bool
--
- # Timekeeping vsyscall support
- config GENERIC_TIME_VSYSCALL
-       bool
-diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
-index bcbb52db22565..d7f99e69bce4b 100644
---- a/kernel/time/timekeeping_internal.h
-+++ b/kernel/time/timekeeping_internal.h
-@@ -13,7 +13,6 @@ extern void tk_debug_account_sleep_time(const struct timespec64 *t);
- #define tk_debug_account_sleep_time(x)
- #endif
- 
--#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
- static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
- {
-       u64 ret = (now - last) & mask;
-@@ -24,11 +23,5 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
-        */
-       return ret & ~(mask >> 1) ? 0 : ret;
- }
--#else
--static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
--{
--      return (now - last) & mask;
--}
--#endif
- 
- #endif /* _TIMEKEEPING_INTERNAL_H */
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 529642d7cb1f9157f75b603016b2b202ea4ec866..c001e56ff0563d3ba376e135034cc93dda682898 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -645,7 +645,6 @@ btrfs-do-not-clear-read-only-when-adding-sprout-devi.patch
 kselftest-arm64-don-t-leak-pipe-fds-in-pac.exec_sign.patch
 kcsan-turn-report_filterlist_lock-into-a-raw_spinloc.patch
 perf-x86-amd-warn-only-on-new-bits-set.patch
-timekeeping-always-check-for-negative-motion.patch
 media-uvcvideo-add-a-quirk-for-the-kaiweets-kti-w02-.patch
 media-cx231xx-add-support-for-dexatek-usb-video-grab.patch
 mmc-core-add-sd-card-quirk-for-broken-poweroff-notif.patch

diff --git a/queue-6.1/timekeeping-always-check-for-negative-motion.patch b/queue-6.1/timekeeping-always-check-for-negative-motion.patch
deleted file mode 100644 (file)
index c702ab7..0000000
--- a/queue-6.1/timekeeping-always-check-for-negative-motion.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 676cf17c4fdd5031d8122492e663ad1f5b057285 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:04:08 +0100
-Subject: timekeeping: Always check for negative motion
-
-From: Thomas Gleixner <tglx@linutronix.de>
-
-[ Upstream commit c163e40af9b2331b2c629fd4ec8b703ed4d4ae39 ]
-
-clocksource_delta() has two variants. One with a check for negative motion,
-which is only selected by x86. This is a historic leftover as this function
-was previously used in the time getter hot paths.
-
-Since 135225a363ae timekeeping_cycles_to_ns() has unconditional protection
-against this as a by-product of the protection against 64bit math overflow.
-
-clocksource_delta() is only used in the clocksource watchdog and in
-timekeeping_advance(). The extra conditional there is not hurting anyone.
-
-Remove the config option and unconditionally prevent negative motion of the
-readout.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Acked-by: John Stultz <jstultz@google.com>
-Link: https://lore.kernel.org/all/20241031120328.599430157@linutronix.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/Kconfig                   | 1 -
- kernel/time/Kconfig                | 5 -----
- kernel/time/timekeeping_internal.h | 7 -------
- 3 files changed, 13 deletions(-)
-
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 49cea5b81649d..c75e18346c89b 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -131,7 +131,6 @@ config X86
-       select ARCH_HAS_PARANOID_L1D_FLUSH
-       select BUILDTIME_TABLE_SORT
-       select CLKEVT_I8253
--      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
-       select CLOCKSOURCE_WATCHDOG
-       # Word-size accesses may read uninitialized data past the trailing \0
-       # in strings and cause false KMSAN reports.
-diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
-index a41753be1a2bf..6ce5b66643f0b 100644
---- a/kernel/time/Kconfig
-+++ b/kernel/time/Kconfig
-@@ -17,11 +17,6 @@ config ARCH_CLOCKSOURCE_DATA
- config ARCH_CLOCKSOURCE_INIT
-       bool
- 
--# Clocksources require validation of the clocksource against the last
--# cycle update - x86/TSC misfeature
--config CLOCKSOURCE_VALIDATE_LAST_CYCLE
--      bool
--
- # Timekeeping vsyscall support
- config GENERIC_TIME_VSYSCALL
-       bool
-diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
-index 4ca2787d1642e..1d4854d5c386e 100644
---- a/kernel/time/timekeeping_internal.h
-+++ b/kernel/time/timekeeping_internal.h
-@@ -15,7 +15,6 @@ extern void tk_debug_account_sleep_time(const struct timespec64 *t);
- #define tk_debug_account_sleep_time(x)
- #endif
- 
--#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
- static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
- {
-       u64 ret = (now - last) & mask;
-@@ -26,12 +25,6 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
-        */
-       return ret & ~(mask >> 1) ? 0 : ret;
- }
--#else
--static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
--{
--      return (now - last) & mask;
--}
--#endif
- 
- /* Semi public for serialization of non timekeeper VDSO updates. */
- extern raw_spinlock_t timekeeper_lock;
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 858f316df0a70b2ce03619adfa9d2a5861864b23..11c41445f167f2e42396ab5e5f47abcd30b702fa 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -192,7 +192,6 @@ kcsan-turn-report_filterlist_lock-into-a-raw_spinloc.patch
 hwmon-nct6775-add-665-ace-600m-cl-to-asus-wmi-monito.patch
 acpi-x86-make-uart-skip-quirks-work-on-pci-uarts-wit.patch
 perf-x86-amd-warn-only-on-new-bits-set.patch
-timekeeping-always-check-for-negative-motion.patch
 spi-spi-fsl-lpspi-adjust-type-of-scldiv.patch
 hid-add-per-device-quirk-to-force-bind-to-hid-generi.patch
 media-uvcvideo-realsense-d421-depth-module-metadata.patch

diff --git a/queue-6.6/timekeeping-always-check-for-negative-motion.patch b/queue-6.6/timekeeping-always-check-for-negative-motion.patch
deleted file mode 100644 (file)
index 16da869..0000000
--- a/queue-6.6/timekeeping-always-check-for-negative-motion.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 5617f2f08518911b013752a1f4fcb0e2524f241f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 31 Oct 2024 13:04:08 +0100
-Subject: timekeeping: Always check for negative motion
-
-From: Thomas Gleixner <tglx@linutronix.de>
-
-[ Upstream commit c163e40af9b2331b2c629fd4ec8b703ed4d4ae39 ]
-
-clocksource_delta() has two variants. One with a check for negative motion,
-which is only selected by x86. This is a historic leftover as this function
-was previously used in the time getter hot paths.
-
-Since 135225a363ae timekeeping_cycles_to_ns() has unconditional protection
-against this as a by-product of the protection against 64bit math overflow.
-
-clocksource_delta() is only used in the clocksource watchdog and in
-timekeeping_advance(). The extra conditional there is not hurting anyone.
-
-Remove the config option and unconditionally prevent negative motion of the
-readout.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Acked-by: John Stultz <jstultz@google.com>
-Link: https://lore.kernel.org/all/20241031120328.599430157@linutronix.de
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/Kconfig                   | 1 -
- kernel/time/Kconfig                | 5 -----
- kernel/time/timekeeping_internal.h | 7 -------
- 3 files changed, 13 deletions(-)
-
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 05c82fd5d0f60..a8bff6520bd61 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -136,7 +136,6 @@ config X86
-       select ARCH_HAS_PARANOID_L1D_FLUSH
-       select BUILDTIME_TABLE_SORT
-       select CLKEVT_I8253
--      select CLOCKSOURCE_VALIDATE_LAST_CYCLE
-       select CLOCKSOURCE_WATCHDOG
-       # Word-size accesses may read uninitialized data past the trailing \0
-       # in strings and cause false KMSAN reports.
-diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
-index bae8f11070bef..1f0f86e51d042 100644
---- a/kernel/time/Kconfig
-+++ b/kernel/time/Kconfig
-@@ -17,11 +17,6 @@ config ARCH_CLOCKSOURCE_DATA
- config ARCH_CLOCKSOURCE_INIT
-       bool
- 
--# Clocksources require validation of the clocksource against the last
--# cycle update - x86/TSC misfeature
--config CLOCKSOURCE_VALIDATE_LAST_CYCLE
--      bool
--
- # Timekeeping vsyscall support
- config GENERIC_TIME_VSYSCALL
-       bool
-diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h
-index 4ca2787d1642e..1d4854d5c386e 100644
---- a/kernel/time/timekeeping_internal.h
-+++ b/kernel/time/timekeeping_internal.h
-@@ -15,7 +15,6 @@ extern void tk_debug_account_sleep_time(const struct timespec64 *t);
- #define tk_debug_account_sleep_time(x)
- #endif
- 
--#ifdef CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE
- static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
- {
-       u64 ret = (now - last) & mask;
-@@ -26,12 +25,6 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
-        */
-       return ret & ~(mask >> 1) ? 0 : ret;
- }
--#else
--static inline u64 clocksource_delta(u64 now, u64 last, u64 mask)
--{
--      return (now - last) & mask;
--}
--#endif
- 
- /* Semi public for serialization of non timekeeper VDSO updates. */
- extern raw_spinlock_t timekeeper_lock;
--- 
-2.43.0
-