Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 333bb864 authored by Alex Shi's avatar Alex Shi Committed by Ingo Molnar
Browse files

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: default avatarAlex 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: default avatarIngo Molnar <mingo@kernel.org>
parent add332a1

kernel/sched/debug.c

+6 −4
Original line number Diff line number Diff line
@@ -209,22 +209,24 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
			cfs_rq->nr_spread_over);

	SEQ_printf(m, "  .%-30s: %d\n", "nr_running", cfs_rq->nr_running);

	SEQ_printf(m, "  .%-30s: %ld\n", "load", cfs_rq->load.weight);

#ifdef CONFIG_FAIR_GROUP_SCHED

#ifdef CONFIG_SMP

	SEQ_printf(m, "  .%-30s: %ld\n", "runnable_load_avg",

			cfs_rq->runnable_load_avg);

	SEQ_printf(m, "  .%-30s: %ld\n", "blocked_load_avg",

			cfs_rq->blocked_load_avg);

	SEQ_printf(m, "  .%-30s: %ld\n", "tg_load_avg",

			atomic_long_read(&cfs_rq->tg->load_avg));

#ifdef CONFIG_FAIR_GROUP_SCHED

	SEQ_printf(m, "  .%-30s: %ld\n", "tg_load_contrib",

			cfs_rq->tg_load_contrib);

	SEQ_printf(m, "  .%-30s: %d\n", "tg_runnable_contrib",

			cfs_rq->tg_runnable_contrib);

	SEQ_printf(m, "  .%-30s: %ld\n", "tg_load_avg",

			atomic_long_read(&cfs_rq->tg->load_avg));

	SEQ_printf(m, "  .%-30s: %d\n", "tg->runnable_avg",

			atomic_read(&cfs_rq->tg->runnable_avg));

#endif

#endif



#ifdef CONFIG_FAIR_GROUP_SCHED

	print_cfs_group_stats(m, cpu, cfs_rq->tg);

#endif

}
@@ -567,7 +569,7 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) 
		   "nr_involuntary_switches", (long long)p->nivcsw);



	P(se.load.weight);

#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)

#ifdef CONFIG_SMP

	P(se.avg.runnable_avg_sum);

	P(se.avg.runnable_avg_period);

	P(se.avg.load_avg_contrib);