diff --git a/[refs] b/[refs] index 09692ad2a78b..5516392b00e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af92723262f3e0c431083f668b605a1dcdbe8f3d +refs/heads/master: 3e9830dcabdeb3656855ec1b678b6bcf3b50261c diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index f370f108ed04..1a80ac1b6dab 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -5476,8 +5476,7 @@ int __init migration_init(void) int nr_cpu_ids __read_mostly = NR_CPUS; EXPORT_SYMBOL(nr_cpu_ids); -#undef SCHED_DOMAIN_DEBUG -#ifdef SCHED_DOMAIN_DEBUG +#ifdef CONFIG_SCHED_DEBUG static void sched_domain_debug(struct sched_domain *sd, int cpu) { int level = 0;