sched: Revert 1b9508f in preparation for new version
PATCH 1/2 sched: Revert 1b9508f in preparation for new version
sched: Revert 1b9508f in preparation for new version
Signed-off-by Mike Galbraith <[email protected]>
Cc Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched.c | 22 +--------------------- kernel/sched_debug.c | 4 ---- 2 files changed, 1 insertion(+), 25 deletions(-)
kernel/sched.c +1 -21
@@ -589,8 +589,6 @@ struct rq {u64 rt_avg;u64 age_stamp; -u64 idle_stamp; -u64 avg_idle;#endif /* calc_load related fields */
@@ -2383,17 +2381,6 @@ static int try_to_wake_up(struct task_stif (rq != orig_rq)update_rq_clock (rq); -if (rq->idle_stamp) { -u64 delta = rq->clock - rq->idle_stamp; -u64 max =2 *sysctl_sched_migration_cost; - -if (delta > max) - rq->avg_idle = max; -else -update_avg (&rq->avg_idle, delta); - rq->idle_stamp =0 ; - } -WARN_ON (p->state !=TASK_WAKING ); cpu =task_cpu (p);
@@ -4430,11 +4417,6 @@ static void idle_balance(int this_cpu, sint pulled_task =0 ;unsigned long next_balance = jiffies +HZ ; - this_rq->idle_stamp = this_rq->clock; - -if (this_rq->avg_idle < sysctl_sched_migration_cost) -return ; -for_each_domain (this_cpu, sd) {unsigned long interval;
@@ -4449,10 +4431,8 @@ static void idle_balance(int this_cpu, s interval =msecs_to_jiffies (sd->balance_interval);if (time_after (next_balance, sd->last_balance + interval)) next_balance = sd->last_balance + interval; -if (pulled_task) { - this_rq->idle_stamp =0 ; +if (pulled_task)break ; - } }if (pulled_task ||time_after (jiffies, this_rq->next_balance)) {/*
kernel/sched_debug.c +0 -4
@@ -285,16 +285,12 @@ static void print_cpu(struct seq_file *m#ifdef CONFIG_SCHEDSTATS #define P (n) SEQ_printf(m, " .%-30s: %d\n", #n, rq->n); -#define P64 (n) SEQ_printf(m, " .%-30s: %Ld\n", #n, rq->n);P (yld_count);P (sched_switch);P (sched_count);P (sched_goidle); -#ifdef CONFIG_SMP -P64 (avg_idle); -#endif P (ttwu_count);P (ttwu_local);