Commit bea1dc68 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

[PATCH] Fix broken domain debugging (aka "isolcpus option broken")

Fix an oops in sched_domain_debug when using the isolcpus= option.

Also move a debug check for validating groups into the "for-each-group"
loop, where it should be.
Signed-off-by: default avatarNick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d6f0f257
...@@ -4446,6 +4446,7 @@ static void sched_domain_debug(void) ...@@ -4446,6 +4446,7 @@ static void sched_domain_debug(void)
if (sd->parent) if (sd->parent)
printk(" ERROR !SD_LOAD_BALANCE domain has parent"); printk(" ERROR !SD_LOAD_BALANCE domain has parent");
printk("\n"); printk("\n");
break;
} }
printk("span %s\n", str); printk("span %s\n", str);
...@@ -4454,8 +4455,6 @@ static void sched_domain_debug(void) ...@@ -4454,8 +4455,6 @@ static void sched_domain_debug(void)
printk(KERN_DEBUG "ERROR domain->span does not contain CPU%d\n", i); printk(KERN_DEBUG "ERROR domain->span does not contain CPU%d\n", i);
if (!cpu_isset(i, group->cpumask)) if (!cpu_isset(i, group->cpumask))
printk(KERN_DEBUG "ERROR domain->groups does not contain CPU%d\n", i); printk(KERN_DEBUG "ERROR domain->groups does not contain CPU%d\n", i);
if (!group->cpu_power)
printk(KERN_DEBUG "ERROR domain->cpu_power not set\n");
printk(KERN_DEBUG); printk(KERN_DEBUG);
for (j = 0; j < level + 2; j++) for (j = 0; j < level + 2; j++)
...@@ -4466,6 +4465,9 @@ static void sched_domain_debug(void) ...@@ -4466,6 +4465,9 @@ static void sched_domain_debug(void)
printk(" ERROR: NULL"); printk(" ERROR: NULL");
break; break;
} }
if (!group->cpu_power)
printk(KERN_DEBUG "ERROR group->cpu_power not set\n");
if (!cpus_weight(group->cpumask)) if (!cpus_weight(group->cpumask))
printk(" ERROR empty group:"); printk(" ERROR empty group:");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment