diff --git a/[refs] b/[refs] index eb6f9a946d80..e47a4abcfccb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac7d550499e225efb51a53d0b00667f26b93bdff +refs/heads/master: 571f6d2fb0b1c04798df783db2ba85e96bcce43d diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index f04add905bdf..fdd26fffaa20 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2915,6 +2915,9 @@ static inline int wake_priority_sleeper(struct rq *rq) int ret = 0; #ifdef CONFIG_SCHED_SMT + if (!rq->nr_running) + return 0; + spin_lock(&rq->lock); /* * If an SMT sibling task has been put to sleep for priority