diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 14:46:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 14:46:18 -0800 |
| commit | 80a186074e72e2cd61f6716d90cf32ce54981a56 (patch) | |
| tree | c5f75a83498df0ea2109067b797ec7986479dda0 /kernel/sched.c | |
| parent | 15c989d4d14b82f43cae7efc6a7794cdd556f274 (diff) | |
| parent | 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc (diff) | |
| download | op-kernel-dev-80a186074e72e2cd61f6716d90cf32ce54981a56.zip op-kernel-dev-80a186074e72e2cd61f6716d90cf32ce54981a56.tar.gz | |
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 150b698..9ab3cd7 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, { 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; |
