diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 7be88a7be047..720df108a2d6 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -2041,7 +2041,8 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) | |||
2041 | * We should never call set_task_cpu() on a blocked task, | 2041 | * We should never call set_task_cpu() on a blocked task, |
2042 | * ttwu() will sort out the placement. | 2042 | * ttwu() will sort out the placement. |
2043 | */ | 2043 | */ |
2044 | WARN_ON_ONCE(p->state != TASK_RUNNING && p->state != TASK_WAKING); | 2044 | WARN_ON_ONCE(p->state != TASK_RUNNING && p->state != TASK_WAKING && |
2045 | !(task_thread_info(p)->preempt_count & PREEMPT_ACTIVE)); | ||
2045 | #endif | 2046 | #endif |
2046 | 2047 | ||
2047 | trace_sched_migrate_task(p, new_cpu); | 2048 | trace_sched_migrate_task(p, new_cpu); |