Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: "The timer departement delivers: - a regression fix for the NTP code along with a proper selftest - prevent a spurious timer interrupt in the NOHZ lowres code - a fix for user space interfaces returning the remaining time on architectures with CONFIG_TIME_LOW_RES=y - a few patches to fix COMPILE_TEST fallout" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick/nohz: Set the correct expiry when switching to nohz/lowres mode clocksource: Fix dependencies for archs w/o HAS_IOMEM clocksource: Select CLKSRC_MMIO where needed tick/sched: Hide unused oneshot timer code kselftests: timers: Add adjtimex SETOFFSET validity tests ntp: Fix ADJ_SETOFFSET being used w/ ADJ_NANO itimers: Handle relative timers with CONFIG_TIME_LOW_RES proper posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper timerfd: Handle relative timers with CONFIG_TIME_LOW_RES proper hrtimer: Handle remaining time proper for TIME_LOW_RES clockevents/tcb_clksrc: Prevent disabling an already disabled clock
Showing
- drivers/clocksource/Kconfig 12 additions, 0 deletionsdrivers/clocksource/Kconfig
- drivers/clocksource/tcb_clksrc.c 2 additions, 1 deletiondrivers/clocksource/tcb_clksrc.c
- fs/timerfd.c 1 addition, 1 deletionfs/timerfd.c
- include/linux/hrtimer.h 31 additions, 3 deletionsinclude/linux/hrtimer.h
- kernel/time/hrtimer.c 37 additions, 18 deletionskernel/time/hrtimer.c
- kernel/time/itimer.c 1 addition, 1 deletionkernel/time/itimer.c
- kernel/time/ntp.c 12 additions, 2 deletionskernel/time/ntp.c
- kernel/time/posix-timers.c 1 addition, 1 deletionkernel/time/posix-timers.c
- kernel/time/tick-sched.c 9 additions, 7 deletionskernel/time/tick-sched.c
- kernel/time/timer_list.c 1 addition, 1 deletionkernel/time/timer_list.c
- tools/testing/selftests/timers/valid-adjtimex.c 138 additions, 1 deletiontools/testing/selftests/timers/valid-adjtimex.c
Please register or sign in to comment