diff options
| author | Nick Piggin <piggin@cyberone.com.au> | 2004-12-07 15:41:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-07 15:41:46 -0800 |
| commit | bea1dc68857e7068890bdc46d1f3b4ccfcb0453e (patch) | |
| tree | 79af4c5011ea717834c2b448892c6fa9f8dd60a6 /kernel | |
| parent | d6f0f257cd8f5bf3dd307637d0ebf21298aa5d54 (diff) | |
| download | history-bea1dc68857e7068890bdc46d1f3b4ccfcb0453e.tar.gz | |
[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: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index c096b7be280882..a356f39ea93824 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -4446,6 +4446,7 @@ static void sched_domain_debug(void) if (sd->parent) printk(" ERROR !SD_LOAD_BALANCE domain has parent"); printk("\n"); + break; } printk("span %s\n", str); @@ -4454,8 +4455,6 @@ static void sched_domain_debug(void) printk(KERN_DEBUG "ERROR domain->span does not contain CPU%d\n", i); if (!cpu_isset(i, group->cpumask)) 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); for (j = 0; j < level + 2; j++) @@ -4466,6 +4465,9 @@ static void sched_domain_debug(void) printk(" ERROR: NULL"); break; } + + if (!group->cpu_power) + printk(KERN_DEBUG "ERROR group->cpu_power not set\n"); if (!cpus_weight(group->cpumask)) printk(" ERROR empty group:"); |