|
@@ -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;
|
|
int cpu, orig_cpu, this_cpu, success = 0;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
- struct rq *rq, *orig_rq;
|
|
|
|
|
|
+ struct rq *rq;
|
|
|
|
|
|
if (!sched_feat(SYNC_WAKEUPS))
|
|
if (!sched_feat(SYNC_WAKEUPS))
|
|
wake_flags &= ~WF_SYNC;
|
|
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();
|
|
this_cpu = get_cpu();
|
|
|
|
|
|
smp_wmb();
|
|
smp_wmb();
|
|
- rq = orig_rq = task_rq_lock(p, &flags);
|
|
|
|
|
|
+ rq = task_rq_lock(p, &flags);
|
|
update_rq_clock(rq);
|
|
update_rq_clock(rq);
|
|
if (!(p->state & state))
|
|
if (!(p->state & state))
|
|
goto out;
|
|
goto out;
|