From 54c4b1b6a03fcac3f220dee325ae9a1d1791e9e7 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 20 Aug 2008 16:54:44 -0700 Subject: [PATCH] --- yaml --- r: 110703 b: refs/heads/master c: f31e11d87a5d7601636710195891ba462ad99f11 h: refs/heads/master i: 110701: 2774a2c4ca6ff3e6b109dd32581deeb46dd56f41 110699: 3036e3323370188ca5e6a6579bc2885eee61d995 110695: f20d1181bf77b4014add19bb428241293d3f50ff 110687: 23761036d5dee56b6aa33f40bfdc1480eea5a985 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8d66e2279d6f..193b1b5041f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94d3d8247de22c5b0624aa00616ceca459498e55 +refs/heads/master: f31e11d87a5d7601636710195891ba462ad99f11 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index da7c5d23cc03..908670aa215a 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1921,11 +1921,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) running = task_running(rq, p); on_rq = p->se.on_rq; ncsw = 0; - if (!match_state || p->state == match_state) { - ncsw = p->nivcsw + p->nvcsw; - if (unlikely(!ncsw)) - ncsw = 1; - } + if (!match_state || p->state == match_state) + ncsw = p->nvcsw ?: 1; task_rq_unlock(rq, &flags); /*