Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: "This update from the timer departement contains: - A series of patches which address a shortcoming in the tick broadcast code. If the broadcast device is not available or an hrtimer emulated broadcast device, some of the original assumptions lead to boot failures. I rather plugged all of the corner cases instead of only addressing the issue reported, so the change got a little larger. Has been extensivly tested on x86 and arm. - Get rid of the last holdouts using do_posix_clock_monotonic_gettime() - A regression fix for the imx clocksource driver - An update to the new state callbacks mechanism for clockevents. This is required to simplify the conversion, which will take place in 4.3" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick/broadcast: Prevent NULL pointer dereference time: Get rid of do_posix_clock_monotonic_gettime cris: Replace do_posix_clock_monotonic_gettime() tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build tick/broadcast: Handle spurious interrupts gracefully tick/broadcast: Check for hrtimer broadcast active early tick/broadcast: Return busy when IPI is pending tick/broadcast: Return busy if periodic mode and hrtimer broadcast tick/broadcast: Move the check for periodic mode inside state handling tick/broadcast: Prevent deep idle if no broadcast device available tick/broadcast: Make idle check independent from mode and config tick/broadcast: Sanity check the shutdown of the local clock_event tick/broadcast: Prevent hrtimer recursion clockevents: Allow set-state callbacks to be optional clocksource/imx: Define clocksource for mx27
Showing
- arch/cris/arch-v32/drivers/sync_serial.c 1 addition, 1 deletionarch/cris/arch-v32/drivers/sync_serial.c
- drivers/clocksource/timer-imx-gpt.c 1 addition, 0 deletionsdrivers/clocksource/timer-imx-gpt.c
- include/linux/tick.h 5 additions, 2 deletionsinclude/linux/tick.h
- include/linux/timekeeping.h 0 additions, 1 deletioninclude/linux/timekeeping.h
- kernel/time/clockevents.c 9 additions, 15 deletionskernel/time/clockevents.c
- kernel/time/tick-broadcast.c 108 additions, 55 deletionskernel/time/tick-broadcast.c
- kernel/time/tick-common.c 21 additions, 0 deletionskernel/time/tick-common.c
- kernel/time/tick-sched.h 10 additions, 0 deletionskernel/time/tick-sched.h
Loading
Please register or sign in to comment