Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4cee21e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'timers-core-for-linus' and 'timers-urgent-for-linus' of... 

Merge branches 'timers-core-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer updates - and a leftover fix - from Thomas Gleixner:
 "A rather large (commit wise) update from the timer side:

   - A bulk update to make compile tests work in the clocksource drivers

   - An overhaul of the h8300 timers

   - Some more Y2038 work

   - A few overflow prevention checks in the timekeeping/ntp code

   - The usual pile of fixes and improvements to the various
     clocksource/clockevent drivers and core code"

Also:
 "A single fix for the posix-clock poll code which did not make it into
  4.4"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (84 commits)
  clocksource/drivers/acpi_pm: Convert to pr_* macros
  clocksource: Make clocksource validation work for all clocksources
  timekeeping: Cap adjustments so they don't exceed the maxadj value
  ntp: Fix second_overflow's input parameter type to be 64bits
  ntp: Change time_reftime to time64_t and utilize 64bit __ktime_get_real_seconds
  timekeeping: Provide internal function __ktime_get_real_seconds
  clocksource/drivers/h8300: Use ioread / iowrite
  clocksource/drivers/h8300: Initializer cleanup.
  clocksource/drivers/h8300: Simplify delta handling
  clocksource/drivers/h8300: Fix timer not overflow case
  clocksource/drivers/h8300: Change to overflow interrupt
  clocksource/drivers/lpc32: Correct pr_err() output format
  clocksource/drivers/arm_global_timer: Fix suspend resume
  clocksource/drivers/pistachio: Fix wrong calculated clocksource read value
  clockevents/drivers/arm_global_timer: Use writel_relaxed in gt_compare_set
  clocksource/drivers/dw_apb_timer: Inline apbt_readl and apbt_writel
  clocksource/drivers/dw_apb_timer: Use {readl|writel}_relaxed in critical path
  clocksource/drivers/dw_apb_timer: Fix apbt_readl return types
  clocksource/drivers/tango-xtal: Replace code by clocksource_mmio_init
  clocksource/drivers/h8300: Increase the compilation test coverage
  ...

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix-clock: Fix return code on the poll method's error path
parents ae8a5218 01414888 1b9f2372

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -9364,7 +9364,7 @@ M: Andreas Noever <andreas.noever@gmail.com> 
S:	Maintained

F:	drivers/thunderbolt/



TIMEKEEPING, CLOCKSOURCE CORE, NTP

TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER

M:	John Stultz <john.stultz@linaro.org>

M:	Thomas Gleixner <tglx@linutronix.de>

L:	linux-kernel@vger.kernel.org
@@ -9377,6 +9377,7 @@ F: include/uapi/linux/time.h 
F:	include/uapi/linux/timex.h

F:	kernel/time/clocksource.c

F:	kernel/time/time*.c

F:	kernel/time/alarmtimer.c

F:	kernel/time/ntp.c

F:	tools/testing/selftests/timers/

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ config ARCH_PXA 
	select AUTO_ZRELADDR

	select COMMON_CLK

	select CLKDEV_LOOKUP

	select CLKSRC_PXA

	select CLKSRC_MMIO

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS
@@ -650,6 +651,8 @@ config ARCH_SA1100 
	select ARCH_SPARSEMEM_ENABLE

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_PXA

	select CLKSRC_OF if OF

	select CPU_FREQ

	select CPU_SA1100

	select GENERIC_CLOCKEVENTS

arch/arm/mach-exynos/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ menuconfig ARCH_EXYNOS 
	select SRAM

	select THERMAL

	select MFD_SYSCON

	select CLKSRC_EXYNOS_MCT

	help

	  Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)

arch/arm/mach-sti/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ menuconfig ARCH_STI 
	select ARM_GIC

	select ST_IRQCHIP

	select ARM_GLOBAL_TIMER

	select CLKSRC_ST_LPC

	select PINCTRL

	select PINCTRL_ST

	select MFD_SYSCON

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ config UX500_SOC_DB8500 
	select PINCTRL_AB8540

	select REGULATOR

	select REGULATOR_DB8500_PRCMU

	select CLKSRC_DBX500_PRCMU

	select PM_GENERIC_DOMAINS if PM



config MACH_MOP500