diff options
| author | kanoj <kanoj> | 2002-01-29 01:10:20 +0000 |
|---|---|---|
| committer | kanoj <kanoj> | 2002-01-29 01:10:20 +0000 |
| commit | a9e46fd6ff191750dd6f661f514e5687875b3a73 (patch) | |
| tree | 83f6e1a9ed8941d16a17dd2c8784c122ddf578de | |
| parent | 3e10ce1c3abdad958c2cb44602ce0a91ba426ef4 (diff) | |
| download | netdev-vger-cvs-a9e46fd6ff191750dd6f661f514e5687875b3a73.tar.gz | |
Forward port 2.4 fix: Eliminate error printk when booting single
cpu via maxcpus kernel command line. Also, make maxcpus work with
the wait_init_idle changes.
| -rw-r--r-- | arch/sparc64/kernel/smp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index 8ff3e19b5..7ea6ee240 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c @@ -258,7 +258,7 @@ void __init smp_boot_cpus(void) continue; if ((cpucount + 1) == max_cpus) - break; + goto ignorecpu; if (cpu_present_map & (1UL << i)) { unsigned long entry = (unsigned long)(&sparc64_cpu_startup); unsigned long cookie = (unsigned long)(&cpu_new_task); @@ -300,13 +300,15 @@ void __init smp_boot_cpus(void) } } if (!callin_flag) { +ignorecpu: cpu_present_map &= ~(1UL << i); __cpu_number_map[i] = -1; } } cpu_new_task = NULL; if (cpucount == 0) { - printk("Error: only one processor found.\n"); + if (max_cpus != 1) + printk("Error: only one processor found.\n"); cpu_present_map = (1UL << smp_processor_id()); } else { unsigned long bogosum = 0; |