Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

timekeeping: Remove the temporary CLOCK_AUX workaround

ktime_get_clock_ts64() was provided for the networking tree as a stand
alone commit based on v6.16-rc1. It contains a temporary workaround for the
CLOCK_AUX* defines, which are only available in the timekeeping tree.

As this commit is now merged into the timers/ptp branch, which contains the
real CLOCK_AUX* defines, the workaround is obsolete.

Remove it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250701130923.579834908@linutronix.de

-9
-9
include/linux/timekeeping.h
··· 357 357 extern int update_persistent_clock64(struct timespec64 now); 358 358 #endif 359 359 360 - /* Temporary workaround to avoid merge dependencies and cross tree messes */ 361 - #ifndef CLOCK_AUX 362 - #define CLOCK_AUX MAX_CLOCKS 363 - #define MAX_AUX_CLOCKS 8 364 - #define CLOCK_AUX_LAST (CLOCK_AUX + MAX_AUX_CLOCKS - 1) 365 - 366 - static inline bool ktime_get_aux_ts64(clockid_t id, struct timespec64 *kt) { return false; } 367 - #endif 368 - 369 360 #endif