From 0fd69c88e81707801f3bd44d5643a82b987645ed Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 6 Mar 2010 14:17:52 +0300
Subject: [PATCH] --- yaml --- r: 187900 b: refs/heads/master c:
 ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0043136f9360..c685811fe45e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14be1f7454ea96ee614467a49cf018a1a383b189
+refs/heads/master: ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 6a212c97f523..2c1db81f80eb 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/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;