tree a13f3bb09c0efe805cf673b941cc87ca84b06ace
parent daba2b314a43c53be61eb98e0e88b094398196f5
parent be6a2e4c46cc122ba9113ba569fbc50fad075fff
author Linus Torvalds <torvalds@linux-foundation.org> 1476120599 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1476120599 -0700

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()"