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
Unified · Split
| @@ -1,4 +1,5 @@ | ||
| 1 | 1 | menu "Clock Source drivers" |
| 2 | + depends on !ARCH_USES_GETTIMEOFFSET | |
| 2 | 3 | |
| 3 | 4 | config CLKSRC_OF |
| 4 | 5 | bool |
| @@ -203,7 +203,7 @@ static int __init ftm_clockevent_init(unsigned long freq, int irq) · 202 unmodified lines | ||
| 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,7 +230,7 @@ static int __init ftm_clocksource_init(unsigned long freq) · 20 unmodified lines | ||
| 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 | |