dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timekeeping: Remove the temporary CLOCK_AUX workaround

Browse Source 
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
This commit is contained in:
Thomas Gleixner
2025-07-03 14:44:15 +02:00
parent a6d9638d4d
commit 8959338617
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/timekeeping.h
-9
View File
@@ -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