mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-10 07:00:48 +00:00
sched: remove double unlikely from schedule()
Combine two unlikely's Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
2070ee01d3
commit
23e3c3cd2e
@ -3882,7 +3882,7 @@ need_resched_nonpreemptible:
|
|||||||
|
|
||||||
if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
|
if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
|
||||||
if (unlikely((prev->state & TASK_INTERRUPTIBLE) &&
|
if (unlikely((prev->state & TASK_INTERRUPTIBLE) &&
|
||||||
unlikely(signal_pending(prev)))) {
|
signal_pending(prev))) {
|
||||||
prev->state = TASK_RUNNING;
|
prev->state = TASK_RUNNING;
|
||||||
} else {
|
} else {
|
||||||
deactivate_task(rq, prev, 1);
|
deactivate_task(rq, prev, 1);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user