Pull timer updates from Thomas Gleixner: "A rather large update for timers/timekeeping: - compat syscall consolidation (Al Viro) - Posix timer consolidation (Christoph Helwig / Thomas Gleixner) - Cleanup of the device tree based initialization for clockevents and clocksources (Daniel Lezcano) - Consolidation of the FTTMR010 clocksource/event driver (Linus Walleij) - The usual set of small fixes and updates all over the place" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (93 commits) timers: Make the cpu base lock raw clocksource/drivers/mips-gic-timer: Fix an error code in 'gic_clocksource_of_init()' clocksource/drivers/fsl_ftm_timer: Unmap region obtained by of_iomap clocksource/drivers/tcb_clksrc: Make IO endian agnostic clocksource/drivers/sun4i: Switch to the timer-of common init clocksource/drivers/timer-of: Fix invalid iomap check Revert "ktime: Simplify ktime_compare implementation" clocksource/drivers: Fix uninitialized variable use in timer_of_init kselftests: timers: Add test for frequency step kselftests: timers: Fix inconsistency-check to not ignore first timestamp time: Add warning about imminent deprecation of CONFIG_GENERIC_TIME_VSYSCALL_OLD time: Clean up CLOCK_MONOTONIC_RAW time handling posix-cpu-timers: Make timespec to nsec conversion safe itimer: Make timeval to nsec conversion range limited timers: Fix parameter description of try_to_del_timer_sync() ktime: Simplify ktime_compare implementation clocksource/drivers/fttmr010: Factor out clock read code clocksource/drivers/fttmr010: Implement delay timer clocksource/drivers: Add timer-of common init routine clocksource/drivers/tcb_clksrc: Save timer context on suspend/resume ...
Showing the changes to include/uapi/linux (1 of 175 files). Show all
Unified · Split
| @@ -54,7 +54,11 @@ struct itimerval { · 53 unmodified lines | ||
| 54 | 54 | #define CLOCK_BOOTTIME 7 |
| 55 | 55 | #define CLOCK_REALTIME_ALARM 8 |
| 56 | 56 | #define CLOCK_BOOTTIME_ALARM 9 |
| 57 | −#define CLOCK_SGI_CYCLE 10 /* Hardware specific */ | |
| 57 | +/* | |
| 58 | + * The driver implementing this got removed. The clock ID is kept as a | |
| 59 | + * place holder. Do not reuse! | |
| 60 | + */ | |
| 61 | +#define CLOCK_SGI_CYCLE 10 | |
| 58 | 62 | #define CLOCK_TAI 11 |
| 59 | 63 | |
| 60 | 64 | #define MAX_CLOCKS 16 |