summaryrefslogtreecommitdiffstats
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
authorDavidlohr Bueso2019-01-04 00:28:48 +0100
committerLinus Torvalds2019-01-04 22:13:48 +0100
commit34ec35ad8f5f4624e8391dbb83afb4c791f027e3 (patch)
tree78a75ab321b42e345f2bd36d7c4b340764208b65 /kernel/sched/core.c
parentkernel/locking/mutex.c: remove caller signal_pending branch predictions (diff)
downloadkernel-qcow2-linux-34ec35ad8f5f4624e8391dbb83afb4c791f027e3.tar.gz
kernel-qcow2-linux-34ec35ad8f5f4624e8391dbb83afb4c791f027e3.tar.xz
kernel-qcow2-linux-34ec35ad8f5f4624e8391dbb83afb4c791f027e3.zip
kernel/sched/: remove caller signal_pending branch predictions
This is already done for us internally by the signal machinery. Link: http://lkml.kernel.org/r/20181116002713.8474-3-dave@stgolabs.net Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f66920173370..17a954c9e153 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3416,7 +3416,7 @@ static void __sched notrace __schedule(bool preempt)
switch_count = &prev->nivcsw;
if (!preempt && prev->state) {
- if (unlikely(signal_pending_state(prev->state, prev))) {
+ if (signal_pending_state(prev->state, prev)) {
prev->state = TASK_RUNNING;
} else {
deactivate_task(rq, prev, DEQUEUE_SLEEP | DEQUEUE_NOCLOCK);