summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-03-06 14:17:52 +0300
committerIngo Molnar <mingo@elte.hu>2010-03-11 13:59:59 +0100
commitab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4 (patch)
tree22801ccd492e5b6927e77aacf24aa61010b3363c /kernel
parent14be1f7454ea96ee614467a49cf018a1a383b189 (diff)
downloadlinux-stable-ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4.tar.gz
linux-stable-ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4.tar.bz2
linux-stable-ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4.zip
sched: Cleanup: remove unused variable in try_to_wake_up()
We haven't used the "orig_rq" variable since 055a00865d "Fix/add missing update_rq_clock() calls" Signed-off-by: Dan Carpenter <error27@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Andreas Herrmann <andreas.herrmann3@amd.com> Cc: Gautham R Shenoy <ego@in.ibm.com> Cc: efault@gmx.de LKML-Reference: <20100306111752.GL4958@bicker> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 6a212c97f523..2c1db81f80eb 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2359,7 +2359,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
{
int cpu, orig_cpu, this_cpu, success = 0;
unsigned long flags;
- struct rq *rq, *orig_rq;
+ struct rq *rq;
if (!sched_feat(SYNC_WAKEUPS))
wake_flags &= ~WF_SYNC;
@@ -2367,7 +2367,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
this_cpu = get_cpu();
smp_wmb();
- rq = orig_rq = task_rq_lock(p, &flags);
+ rq = task_rq_lock(p, &flags);
update_rq_clock(rq);
if (!(p->state & state))
goto out;