[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080703213711.1275.56107.stgit@lsg.lsg.lab.novell.com>
Date: Thu, 03 Jul 2008 15:37:11 -0600
From: Gregory Haskins <ghaskins@...ell.com>
To: stable@...r.kernel.org, linux-rt-users@...r.kernel.org,
rostedt@...dmis.org, mingo@...e.hu
Cc: peterz@...radead.org, ghaskins@...ell.com,
linux-kernel@...r.kernel.org
Subject: [PATCH 1/2] sched: remove extraneous load manipulations
commit 62fb185130e4d420f71a30ff59d8b16b74ef5d2b reverted some patches
in the scheduler, but it looks like it may have left a few redundant
calls to inc_load/dec_load remain in set_user_nice (since the
dequeue_task/enqueue_task take care of the load. This could result
in the load values being off since the load may change while dequeued.
Signed-off-by: Gregory Haskins <ghaskins@...ell.com>
CC: Peter Zijlstra <peterz@...radead.org>
CC: Ingo Molnar <mingo@...e.hu>
---
kernel/sched.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 31f91d9..b046754 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4679,10 +4679,8 @@ void set_user_nice(struct task_struct *p, long nice)
goto out_unlock;
}
on_rq = p->se.on_rq;
- if (on_rq) {
+ if (on_rq)
dequeue_task(rq, p, 0);
- dec_load(rq, p);
- }
p->static_prio = NICE_TO_PRIO(nice);
set_load_weight(p);
@@ -4692,7 +4690,7 @@ void set_user_nice(struct task_struct *p, long nice)
if (on_rq) {
enqueue_task(rq, p, 0);
- inc_load(rq, p);
+
/*
* If the task increased its priority or is running and
* lowered its priority, then reschedule its CPU:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists