X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fparisc%2Fkernel%2Fprocessor.c;h=370086fb8333a8a1b5b6f9fdb17418759dc9e064;hb=4880d10927c93d858d40e297361fff375ee98492;hp=549f5484342c7d6e812edd457bf2c2475ec93fa1;hpb=e00eea42f24550beb9940e641402450f695c888a;p=linux-2.6

diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index 549f548434..370086fb83 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -82,7 +82,12 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
 	unsigned long cpuid;
 	struct cpuinfo_parisc *p;
 
-#ifndef CONFIG_SMP
+#ifdef CONFIG_SMP
+	if (num_online_cpus() >= NR_CPUS) {
+		printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");
+		return 1;
+	}
+#else
 	if (boot_cpu_data.cpu_count > 0) {
 		printk(KERN_INFO "CONFIG_SMP=n  ignoring additional CPUs\n");
 		return 1;