Commit 84ed2da0 authored by Linus Torvalds's avatar Linus Torvalds

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()"
parents daba2b31 be6a2e4c
...@@ -122,12 +122,12 @@ static int smpboot_thread_fn(void *data) ...@@ -122,12 +122,12 @@ static int smpboot_thread_fn(void *data)
if (kthread_should_park()) { if (kthread_should_park()) {
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
preempt_enable();
if (ht->park && td->status == HP_THREAD_ACTIVE) { if (ht->park && td->status == HP_THREAD_ACTIVE) {
BUG_ON(td->cpu != smp_processor_id()); BUG_ON(td->cpu != smp_processor_id());
ht->park(td->cpu); ht->park(td->cpu);
td->status = HP_THREAD_PARKED; td->status = HP_THREAD_PARKED;
} }
preempt_enable();
kthread_parkme(); kthread_parkme();
/* We might have been woken for stop */ /* We might have been woken for stop */
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment