parisc: Replace NR_CPUS in parisc code

parisc: Replace most arrays sized by NR_CPUS with percpu variables.

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 13fc4cd5bfdf..ac2c822928c7 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -298,7 +298,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu)
         irq_desc[irq].affinity = cpumask_of_cpu(cpu);
 #endif
 
-        return cpu_data[cpu].txn_addr;
+        return per_cpu(cpu_data, cpu).txn_addr;
 }
 
 
@@ -309,8 +309,9 @@ 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) && (!cpu_data[next_cpu].txn_addr || 
-                !cpu_online(next_cpu)))
+        while ((next_cpu < NR_CPUS) &&
+                (!per_cpu(cpu_data, next_cpu).txn_addr ||
+                 !cpu_online(next_cpu)))
                 next_cpu++;
 
         if (next_cpu >= NR_CPUS) 
@@ -359,7 +360,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
                 printk(KERN_DEBUG "redirecting irq %d from CPU %d to %d\n",
                        irq, smp_processor_id(), cpu);
                 gsc_writel(irq + CPU_IRQ_BASE,
-                           cpu_data[cpu].hpa);
+                           per_cpu(cpu_data, cpu).hpa);
                 goto set_out;
         }
 #endif