timer fixes for 4.4
Linus,
please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
Two timer fixlets from Arnd:
- Use proper constant size in the FSL timer driver
- Prevent a build error for legacy platforms
Thanks,
tglx
------------------>
Arnd Bergmann (2):
clocksource/fsl: Avoid harmless 64-bit warnings
clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET
drivers/clocksource/Kconfig | 1 + drivers/clocksource/fsl_ftm_timer.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/clocksource/Kconfig +1 -0
@@ -1,4 +1,5 @@ menu "Clock Source drivers" + depends on !ARCH_USES_GETTIMEOFFSET config CLKSRC_OF bool
drivers/clocksource/fsl_ftm_timer.c +2 -2
@@ -203,7 +203,7 @@ static int __init ftm_clockevent_init(unsigned long freq, int irq)int err;ftm_writel (0x00 , priv->clkevt_base +FTM_CNTIN ); -ftm_writel (~0UL , priv->clkevt_base +FTM_MOD ); +ftm_writel (~0u , priv->clkevt_base +FTM_MOD );ftm_reset_counter (priv->clkevt_base);
@@ -230,7 +230,7 @@ static int __init ftm_clocksource_init(unsigned long freq)int err;ftm_writel (0x00 , priv->clksrc_base +FTM_CNTIN ); -ftm_writel (~0UL , priv->clksrc_base +FTM_MOD ); +ftm_writel (~0u , priv->clksrc_base +FTM_MOD );ftm_reset_counter (priv->clksrc_base);