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;