X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fparisc%2Fkernel%2Fprocessor.c;h=e09d0f7fb6b047ad2c2cf34d95046f89f2263874;hb=7cec2ef4a298605b010f1c80041de884e777ea67;hp=df5e28c7a829441e6faca6ccb6f9650685d429aa;hpb=91400ac365da35b18036b46bdda27ddbcee4a663;p=linux-2.6-omap-h63xx.git

diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index df5e28c7a82..e09d0f7fb6b 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -100,8 +100,8 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
 	struct cpuinfo_parisc *p;
 
 #ifdef CONFIG_SMP
-	if (num_online_cpus() >= NR_CPUS) {
-		printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");
+	if (num_online_cpus() >= nr_cpu_ids) {
+		printk(KERN_INFO "num_online_cpus() >= nr_cpu_ids\n");
 		return 1;
 	}
 #else
@@ -214,7 +214,7 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
 	 */
 #ifdef CONFIG_SMP
 	if (cpuid) {
-		cpu_set(cpuid, cpu_present_map);
+		set_cpu_present(cpuid, true);
 		cpu_up(cpuid);
 	}
 #endif