2 files changed, 4 insertions, 4 deletions

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 29e70e16ede8..103752a8fb94 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -311,12 +311,12 @@ unsigned long txn_alloc_addr(unsigned int virt_irq)
         next_cpu++; /* assign to "next" CPU we want this bugger on */
 
         /* validate entry */
-        while ((next_cpu < NR_CPUS) &&
+        while ((next_cpu < nr_cpu_ids) &&
                 (!per_cpu(cpu_data, next_cpu).txn_addr ||
                  !cpu_online(next_cpu)))
                 next_cpu++;
 
-        if (next_cpu >= NR_CPUS) 
+        if (next_cpu >= nr_cpu_ids) 
                 next_cpu = 0;   /* nothing else, assign monarch */
 
         return txn_affinity_addr(virt_irq, next_cpu);
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index ecb609342feb..44a1a509d894 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