The following commit has been merged into the timers/ptp branch of tip:

Commit-ID:     8959338617a85e35820e3a7fa21801cf55b068bf
Gitweb:        https://git.kernel.org/tip/8959338617a85e35820e3a7fa21801cf55b068bf
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Thu, 03 Jul 2025 14:39:28 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 03 Jul 2025 14:44:15 +02:00

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
---
 include/linux/timekeeping.h |  9 ---------
 1 file changed, 9 deletions(-)

diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 6121924..aee2c1a 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -357,13 +357,4 @@ void read_persistent_wall_and_boot_offset(struct timespec64 *wall_clock,
 extern int update_persistent_clock64(struct timespec64 now);
 #endif
 
-/* Temporary workaround to avoid merge dependencies and cross tree messes */
-#ifndef CLOCK_AUX
-#define CLOCK_AUX			MAX_CLOCKS
-#define MAX_AUX_CLOCKS			8
-#define CLOCK_AUX_LAST			(CLOCK_AUX + MAX_AUX_CLOCKS - 1)
-
-static inline bool ktime_get_aux_ts64(clockid_t id, struct timespec64 *kt) { return false; }
-#endif
-
 #endif