CommitterLinus Torvalds (1)
AuthorLinus Torvalds (1)
Branchesmaster (1)


Linux/linux e899cc3 — drivers/clocksource timer-ti-dm.c arm_arch_timer.c, kernel/time timekeeping.h sched_clock.c

by Linus Torvalds on ⎇
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Ingo Molnar:
 "Misc clocksource driver fixes, and a sched-clock wrapping fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timers/sched_clock: Prevent generic sched_clock wrap caused by tick_freeze()
  clocksource/drivers/timer-ti-dm: Remove omap_dm_timer_set_load_start
  clocksource/drivers/oxnas: Fix OX820 compatible
  clocksource/drivers/arm_arch_timer: Remove unneeded pr_fmt macro
  clocksource/drivers/npcm: select TIMER_OF
DeltaFile
+0-28drivers/clocksource/timer-ti-dm.c
+7-0kernel/time/timekeeping.h
+1-4drivers/clocksource/arm_arch_timer.c
+2-2kernel/time/sched_clock.c
+1-1drivers/clocksource/timer-oxnas-rps.c
+2-0kernel/time/tick-common.c
+1-0drivers/clocksource/Kconfig
+14-357 files

UnifiedSplitRaw