diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-24 14:16:42 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-24 14:16:42 +0300 |
commit | 6242258b6b472f8fdd8ed9b735cc1190c185d16d (patch) | |
tree | c8e4c5e31a9c142308d7aca9e920330e0b025d72 /arch/x86/kernel/cpu/mcheck/mce.c | |
parent | 78fea6334f725f1a55cb5761730ceab64255cf1a (diff) | |
parent | abcbcb80cd09cd40f2089d912764e315459b71f7 (diff) | |
download | linux-6242258b6b472f8fdd8ed9b735cc1190c185d16d.tar.xz |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"A small set of fixes for time(r) related issues:
- Fix a long standing conversion issue in jiffies_to_msecs() for odd
HZ values like 1024 or 1200 which resulted in returning 0 for small
jiffies values due to rounding down.
- Use the proper CONFIG symbol in the new Y2038 safe compat code for
posix-timers. Not yet a visible breakage, but this will immediately
trigger when the architecture support for the new interfaces is
merged.
- Return an error code in the STM32 clocksource driver on failure
instead of success.
- Remove the redundant and stale irq disabled check in the posix cpu
timer code. The check is at the wrong place anyway and lockdep
already covers it via the sighand lock locking coverage"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Make sure jiffies_to_msecs() preserves non-zero time periods
posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME
clocksource/drivers/stm32: Fix error return code
posix-cpu-timers: Remove lockdep_assert_irqs_disabled()
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
0 files changed, 0 insertions, 0 deletions