diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:46:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:46:18 -0500 |
commit | 80a186074e72e2cd61f6716d90cf32ce54981a56 (patch) | |
tree | c5f75a83498df0ea2109067b797ec7986479dda0 /kernel/sched.c | |
parent | 15c989d4d14b82f43cae7efc6a7794cdd556f274 (diff) | |
parent | 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc (diff) |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix pick_next_highest_task_rt() for cgroups
sched: Cleanup: remove unused variable in try_to_wake_up()
x86: Fix sched_clock_cpu for systems with unsynchronized TSC
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 150b6988de49..9ab3cd7858d3 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, | |||
2359 | { | 2359 | { |
2360 | int cpu, orig_cpu, this_cpu, success = 0; | 2360 | int cpu, orig_cpu, this_cpu, success = 0; |
2361 | unsigned long flags; | 2361 | unsigned long flags; |
2362 | struct rq *rq, *orig_rq; | 2362 | struct rq *rq; |
2363 | 2363 | ||
2364 | if (!sched_feat(SYNC_WAKEUPS)) | 2364 | if (!sched_feat(SYNC_WAKEUPS)) |
2365 | wake_flags &= ~WF_SYNC; | 2365 | wake_flags &= ~WF_SYNC; |
@@ -2367,7 +2367,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, | |||
2367 | this_cpu = get_cpu(); | 2367 | this_cpu = get_cpu(); |
2368 | 2368 | ||
2369 | smp_wmb(); | 2369 | smp_wmb(); |
2370 | rq = orig_rq = task_rq_lock(p, &flags); | 2370 | rq = task_rq_lock(p, &flags); |
2371 | update_rq_clock(rq); | 2371 | update_rq_clock(rq); |
2372 | if (!(p->state & state)) | 2372 | if (!(p->state & state)) |
2373 | goto out; | 2373 | goto out; |