diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-11 13:52:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-11 13:52:23 -0700 |
| commit | d7fe42a64a19a4140fb94bcf996035319cd3e6b9 (patch) | |
| tree | aad8445db9dd29c1b28d3ba731ca0d42fe85172e /drivers | |
| parent | 02150fab6ae9924ef03e21a15f2d5f7415a9cdf7 (diff) | |
| parent | 0df1c9868c3a1916198ee09c323ca5932a0b8a11 (diff) | |
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 small fixes from the timer departement:
- Prevent the compiler from converting the nanoseconds adjustment
loop in the VDSO update function to a division (__udivdi3) by using
the __iter_div_u64_rem() inline function which exists to prevent
exactly that problem.
- Fix the wrong argument order of the GENMASK macro in the NPCM timer
driver"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping/vsyscall: Use __iter_div_u64_rem()
clocksource/drivers/npcm: Fix misuse of GENMASK macro
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/timer-npcm7xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-npcm7xx.c b/drivers/clocksource/timer-npcm7xx.c index 7a9bb5532d99..8a30da7f083b 100644 --- a/drivers/clocksource/timer-npcm7xx.c +++ b/drivers/clocksource/timer-npcm7xx.c @@ -32,7 +32,7 @@ #define NPCM7XX_Tx_INTEN BIT(29) #define NPCM7XX_Tx_COUNTEN BIT(30) #define NPCM7XX_Tx_ONESHOT 0x0 -#define NPCM7XX_Tx_OPER GENMASK(3, 27) +#define NPCM7XX_Tx_OPER GENMASK(27, 3) #define NPCM7XX_Tx_MIN_PRESCALE 0x1 #define NPCM7XX_Tx_TDR_MASK_BITS 24 #define NPCM7XX_Tx_MAX_CNT 0xFFFFFF |