]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
clocksource: Remove ARCH_CLOCKSOURCE_DATA
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Mar 2026 07:49:11 +0000 (08:49 +0100)
committerThomas Gleixner <tglx@kernel.org>
Wed, 11 Mar 2026 09:18:33 +0000 (10:18 +0100)
After sparc64, there are no remaining users of ARCH_CLOCKSOURCE_DATA
and it can just be removed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Tested-by: Andreas Larsson <andreas@gaisler.com>
Reviewed-by: Andreas Larsson <andreas@gaisler.com>
Acked-by: John Stultz <jstultz@google.com>
Link: https://patch.msgid.link/20260304-vdso-sparc64-generic-2-v6-14-d8eb3b0e1410@linutronix.de
[Thomas: drop sparc64 bits from the patch]

include/linux/clocksource.h
kernel/time/Kconfig

index 65b7c41471c390463770c2da13694e58e83b84ea..12d853b1883265cb47d93e33d8370e3957e7e695 100644 (file)
@@ -25,8 +25,7 @@ struct clocksource_base;
 struct clocksource;
 struct module;
 
-#if defined(CONFIG_ARCH_CLOCKSOURCE_DATA) || \
-    defined(CONFIG_GENERIC_GETTIMEOFDAY)
+#if defined(CONFIG_GENERIC_GETTIMEOFDAY)
 #include <asm/clocksource.h>
 #endif
 
@@ -106,9 +105,6 @@ struct clocksource {
        u64                     max_idle_ns;
        u32                     maxadj;
        u32                     uncertainty_margin;
-#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA
-       struct arch_clocksource_data archdata;
-#endif
        u64                     max_cycles;
        u64                     max_raw_delta;
        const char              *name;
index 7c6a52f7836cef248e0949060b50baa293f446cf..fe33118770978682d0ff6c6e7990896f42703b50 100644 (file)
@@ -9,10 +9,6 @@
 config CLOCKSOURCE_WATCHDOG
        bool
 
-# Architecture has extra clocksource data
-config ARCH_CLOCKSOURCE_DATA
-       bool
-
 # Architecture has extra clocksource init called from registration
 config ARCH_CLOCKSOURCE_INIT
        bool