scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Peter Zijlstra (1):
x86, tsc: Fix a preemption leak in restore_sched_clock_state()
Suresh Siddha (1):
sched: Move sched_avg_update() to update_cpu_load()
arch/x86/kernel/tsc.c | 2 +- kernel/sched.c | 6 ++++++ kernel/sched_fair.c | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-)
arch/x86/kernel/tsc.c +1 -1
@@ -655,7 +655,7 @@ void restore_sched_clock_state(void)local_irq_save (flags); -get_cpu_var (cyc2ns_offset) =0 ; +__get_cpu_var (cyc2ns_offset) =0 ; offset = cyc2ns_suspend -sched_clock ();for_each_possible_cpu (cpu)
kernel/sched.c +6 -0
@@ -1294,6 +1294,10 @@ static void resched_task(struct task_struct *p)static void sched_rt_avg_update (struct rq *rq,u64 rt_delta) { } + +static void sched_avg_update (struct rq *rq) +{ +}#endif /* CONFIG_SMP */ #if BITS_PER_LONG ==32
@@ -3182,6 +3186,8 @@ static void update_cpu_load(struct rq *this_rq) this_rq->cpu_load[i] = (old_load * (scale -1 ) + new_load) >> i; } + +sched_avg_update (this_rq); }static void update_cpu_load_active (struct rq *this_rq)
kernel/sched_fair.c +0 -2
@@ -2268,8 +2268,6 @@ unsigned long scale_rt_power(int cpu)struct rq *rq =cpu_rq (cpu);u64 total, available; -sched_avg_update (rq); - total =sched_avg_period () + (rq->clock - rq->age_stamp); available = total - rq->rt_avg;