diff options
| author | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-01-19 14:07:08 +0100 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-01-19 14:07:08 +0100 |
| commit | ca5519f8ed5b73febf5fd1b6b33c23550a99767d (patch) | |
| tree | 022f742e5c087bbd8ba719f812721b419bc412b6 /kernel | |
| parent | 802699c91a967767fc94759f7a3e5e82d8269245 (diff) | |
Revert "sched: Remove irq time from available CPU power"
This reverts commit fd72c5feeb61857dbcc4fac1c98157925fbb085e.
This commit depends on a3fe22ee824895aafdc1b788e19c081a2e6dd9da which
will be reverted next.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 18 | ||||
| -rw-r--r-- | kernel/sched_fair.c | 7 | ||||
| -rw-r--r-- | kernel/sched_features.h | 5 |
3 files changed, 1 insertions, 29 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index d40d662392cf..fe6c3bd50a0e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -519,10 +519,6 @@ struct rq { u64 avg_idle; #endif -#ifdef CONFIG_IRQ_TIME_ACCOUNTING - u64 prev_irq_time; -#endif - /* calc_load related fields */ unsigned long calc_load_update; long calc_load_active; @@ -647,7 +643,6 @@ static inline struct task_group *task_group(struct task_struct *p) #endif /* CONFIG_CGROUP_SCHED */ static u64 irq_time_cpu(int cpu); -static void sched_irq_time_avg_update(struct rq *rq, u64 irq_time); inline void update_rq_clock(struct rq *rq) { @@ -659,8 +654,6 @@ inline void update_rq_clock(struct rq *rq) irq_time = irq_time_cpu(cpu); if (rq->clock - irq_time > rq->clock_task) rq->clock_task = rq->clock - irq_time; - - sched_irq_time_avg_update(rq, irq_time); } /* @@ -1903,15 +1896,6 @@ void account_system_vtime(struct task_struct *curr) } EXPORT_SYMBOL_GPL(account_system_vtime); -static void sched_irq_time_avg_update(struct rq *rq, u64 curr_irq_time) -{ - if (sched_clock_irqtime && sched_feat(NONIRQ_POWER)) { - u64 delta_irq = curr_irq_time - rq->prev_irq_time; - rq->prev_irq_time = curr_irq_time; - sched_rt_avg_update(rq, delta_irq); - } -} - #else static u64 irq_time_cpu(int cpu) @@ -1919,8 +1903,6 @@ static u64 irq_time_cpu(int cpu) return 0; } -static void sched_irq_time_avg_update(struct rq *rq, u64 curr_irq_time) { } - #endif #include "sched_stats.h" diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 09a98114ec32..cb235ce22e35 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -2281,13 +2281,8 @@ unsigned long scale_rt_power(int cpu) u64 total, available; total = sched_avg_period() + (rq->clock - rq->age_stamp); + available = total - rq->rt_avg; - if (unlikely(total < rq->rt_avg)) { - /* Ensures that power won't end up being negative */ - available = 0; - } else { - available = total - rq->rt_avg; - } if (unlikely((s64)total < SCHED_LOAD_SCALE)) total = SCHED_LOAD_SCALE; diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 185f920ec1a2..83c66e8ad3ee 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h @@ -61,8 +61,3 @@ SCHED_FEAT(ASYM_EFF_LOAD, 1) * release the lock. Decreases scheduling overhead. */ SCHED_FEAT(OWNER_SPIN, 1) - -/* - * Decrement CPU power based on irq activity - */ -SCHED_FEAT(NONIRQ_POWER, 1) |