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 | |
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
-rw-r--r-- | arch/x86/kernel/cpu/intel.c | 3 | ||||
-rw-r--r-- | kernel/sched.c | 4 | ||||
-rw-r--r-- | kernel/sched_rt.c | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 879666f4d871..7e1cca13af35 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -70,7 +70,8 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | |||
70 | if (c->x86_power & (1 << 8)) { | 70 | if (c->x86_power & (1 << 8)) { |
71 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | 71 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); |
72 | set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); | 72 | set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); |
73 | sched_clock_stable = 1; | 73 | if (!check_tsc_unstable()) |
74 | sched_clock_stable = 1; | ||
74 | } | 75 | } |
75 | 76 | ||
76 | /* | 77 | /* |
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; |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 5a6ed1f0990a..b5b920ae2ea7 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -1146,7 +1146,12 @@ static struct task_struct *pick_next_highest_task_rt(struct rq *rq, int cpu) | |||
1146 | if (next && next->prio < idx) | 1146 | if (next && next->prio < idx) |
1147 | continue; | 1147 | continue; |
1148 | list_for_each_entry(rt_se, array->queue + idx, run_list) { | 1148 | list_for_each_entry(rt_se, array->queue + idx, run_list) { |
1149 | struct task_struct *p = rt_task_of(rt_se); | 1149 | struct task_struct *p; |
1150 | |||
1151 | if (!rt_entity_is_task(rt_se)) | ||
1152 | continue; | ||
1153 | |||
1154 | p = rt_task_of(rt_se); | ||
1150 | if (pick_rt_task(rq, p, cpu)) { | 1155 | if (pick_rt_task(rq, p, cpu)) { |
1151 | next = p; | 1156 | next = p; |
1152 | break; | 1157 | break; |