summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2016-09-20 11:05:31 +0200
committerIngo Molnar <mingo@kernel.org>2016-09-22 15:20:25 +0200
commita18a579e5f84daa74f64b1f1b652b4a6a8d6f8b4 (patch)
treec9696e5ec912c768f9a682be72014f1301290dbd /kernel/sched
parent8bf46a39be910937d4c9e8d999a7438a7ae1a75b (diff)
downloadlinux-stable-a18a579e5f84daa74f64b1f1b652b4a6a8d6f8b4.tar.gz
linux-stable-a18a579e5f84daa74f64b1f1b652b4a6a8d6f8b4.tar.bz2
linux-stable-a18a579e5f84daa74f64b1f1b652b4a6a8d6f8b4.zip
sched/debug: Hide printk() by default
Dietmar accidentally added an unconditional sched domain printk. Hide it behind the normal sched_debug flag. Reported-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Fixes: cd92bfd3b8cb ("sched/core: Store maximum per-CPU capacity in root domain") [ Fixed !SCHED_DEBUG build failure. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d7babcc7cb76..8bae0cd09e9e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5739,6 +5739,8 @@ static void sched_domain_debug(struct sched_domain *sd, int cpu)
}
}
#else /* !CONFIG_SCHED_DEBUG */
+
+# define sched_debug_enabled 0
# define sched_domain_debug(sd, cpu) do { } while (0)
static inline bool sched_debug(void)
{
@@ -7006,7 +7008,7 @@ static int build_sched_domains(const struct cpumask *cpu_map,
}
rcu_read_unlock();
- if (rq) {
+ if (rq && sched_debug_enabled) {
pr_info("span: %*pbl (max cpu_capacity = %lu)\n",
cpumask_pr_args(cpu_map), rq->rd->max_cpu_capacity);
}