diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-15 16:04:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-15 16:04:42 -0800 |
commit | 3a19c07c565c1e05b73b165c3dc0750d6863a81c (patch) | |
tree | a13bceba673aac05ac49ad96baa338596ef11fef /kernel/trace | |
parent | 9bd01b9bbdc0aedcc49a6d974a0f30c0a9367f9e (diff) | |
parent | dd5fd9b91a77b4c9c28b7ef9c181b1a875820d0a (diff) | |
download | blackbird-op-linux-3a19c07c565c1e05b73b165c3dc0750d6863a81c.tar.gz blackbird-op-linux-3a19c07c565c1e05b73b165c3dc0750d6863a81c.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"The following trilogy of patches brings you:
- fix for a long standing math overflow issue with HZ < 60
- an onliner fix for a corner case in the dreaded tick broadcast
mechanism affecting a certain range of AMD machines which are
infested with the infamous automagic C1E power control misfeature
- a fix for one of the ARM platforms which allows the kernel to
proceed and boot instead of stupidly panicing for no good reason.
The patch is slightly larger than necessary, but it's less ugly
than the alternative 5 liner"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick: Clear broadcast pending bit when switching to oneshot
clocksource: Kona: Print warning rather than panic
time: Fix overflow when HZ is smaller than 60
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions