Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187900
b: refs/heads/master
c: ab3b3aa
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Ingo Molnar committed Mar 11, 2010
1 parent 2fddf71 commit 0fd69c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 14be1f7454ea96ee614467a49cf018a1a383b189
refs/heads/master: ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4
4 changes: 2 additions & 2 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -2359,15 +2359,15 @@ 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;

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;
Expand Down

0 comments on commit 0fd69c8

Please sign in to comment.