tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull timer fixes from Thomas Gleixner:
"Two timer fixlets from Arnd:

- Use proper constant size in the FSL timer driver
- Prevent a build error for legacy platforms"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET
clocksource/fsl: Avoid harmless 64-bit warnings

Linus Torvalds 707b4f49 4143fc83

+3 -2
+1
drivers/clocksource/Kconfig
··· 1 1 menu "Clock Source drivers" 2 + depends on !ARCH_USES_GETTIMEOFFSET 2 3 3 4 config CLKSRC_OF 4 5 bool
+2 -2
drivers/clocksource/fsl_ftm_timer.c
··· 203 203 int err; 204 204 205 205 ftm_writel(0x00, priv->clkevt_base + FTM_CNTIN); 206 - ftm_writel(~0UL, priv->clkevt_base + FTM_MOD); 206 + ftm_writel(~0u, priv->clkevt_base + FTM_MOD); 207 207 208 208 ftm_reset_counter(priv->clkevt_base); 209 209 ··· 230 230 int err; 231 231 232 232 ftm_writel(0x00, priv->clksrc_base + FTM_CNTIN); 233 - ftm_writel(~0UL, priv->clksrc_base + FTM_MOD); 233 + ftm_writel(~0u, priv->clksrc_base + FTM_MOD); 234 234 235 235 ftm_reset_counter(priv->clksrc_base); 236 236