Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 333bb864f192015a53b5060b829089decd0220ef

Authored by Alex Shi
Committed by Ingo Molnar
1 parent add332a152
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

sched/debug: Remove CONFIG_FAIR_GROUP_SCHED mask 

Now that we are using runnable load avg in sched balance, we don't
need to keep it under CONFIG_FAIR_GROUP_SCHED.

Also align the code style to #ifdef instead of #if defined() and
reorder the tg output info.

Signed-off-by: Alex Shi <alex.shi@intel.com>
Cc: pjt@google.com
Cc: kamalesh@linux.vnet.ibm.com
Cc: peterz@infradead.org
Link: http://lkml.kernel.org/r/1372417835-4698-1-git-send-email-alex.shi@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff

kernel/sched/debug.c
Diff comments   View file @ 333bb86
... ... @@ -209,22 +209,24 @@
209 209 cfs_rq->nr_spread_over);
210 210 SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
211 211 SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight);
212   -#ifdef CONFIG_FAIR_GROUP_SCHED
213 212 #ifdef CONFIG_SMP
214 213 SEQ_printf(m, " .%-30s: %ld\n", "runnable_load_avg",
215 214 cfs_rq->runnable_load_avg);
216 215 SEQ_printf(m, " .%-30s: %ld\n", "blocked_load_avg",
217 216 cfs_rq->blocked_load_avg);
218   - SEQ_printf(m, " .%-30s: %ld\n", "tg_load_avg",
219   - atomic_long_read(&cfs_rq->tg->load_avg));
  217 +#ifdef CONFIG_FAIR_GROUP_SCHED
220 218 SEQ_printf(m, " .%-30s: %ld\n", "tg_load_contrib",
221 219 cfs_rq->tg_load_contrib);
222 220 SEQ_printf(m, " .%-30s: %d\n", "tg_runnable_contrib",
223 221 cfs_rq->tg_runnable_contrib);
  222 + SEQ_printf(m, " .%-30s: %ld\n", "tg_load_avg",
  223 + atomic_long_read(&cfs_rq->tg->load_avg));
224 224 SEQ_printf(m, " .%-30s: %d\n", "tg->runnable_avg",
225 225 atomic_read(&cfs_rq->tg->runnable_avg));
226 226 #endif
  227 +#endif
227 228  
  229 +#ifdef CONFIG_FAIR_GROUP_SCHED
228 230 print_cfs_group_stats(m, cpu, cfs_rq->tg);
229 231 #endif
230 232 }
... ... @@ -567,7 +569,7 @@
567 569 "nr_involuntary_switches", (long long)p->nivcsw);
568 570  
569 571 P(se.load.weight);
570   -#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
  572 +#ifdef CONFIG_SMP
571 573 P(se.avg.runnable_avg_sum);
572 574 P(se.avg.runnable_avg_period);
573 575 P(se.avg.load_avg_contrib);