diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 20:29:59 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 20:29:59 +0300 |
commit | 84ed2da02f4cda6759880c87a213ee80c91ca3bd (patch) | |
tree | a13f3bb09c0efe805cf673b941cc87ca84b06ace /include/uapi/linux/sonet.h | |
parent | daba2b314a43c53be61eb98e0e88b094398196f5 (diff) | |
parent | be6a2e4c46cc122ba9113ba569fbc50fad075fff (diff) | |
download | linux-84ed2da02f4cda6759880c87a213ee80c91ca3bd.tar.xz |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Thomas Gleixner:
"A revert of a commit which pointelessly widened a preempt disabled
section which in turn caused might_sleep() to trigger.
The patch intended to prevent usage of smp_processor_id() in
preemptible context, but the usage in that case is fine because the
thread is pinned on a single cpu and therefore cannot be migrated off"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "sched/core: Do not use smp_processor_id() with preempt enabled in smpboot_thread_fn()"
Diffstat (limited to 'include/uapi/linux/sonet.h')
0 files changed, 0 insertions, 0 deletions