aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/irq.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2009-04-02 01:43:14 +0000
committerKyle McMartin <kyle@mcmartin.ca>2009-04-02 01:43:14 +0000
commit7cec2ef4a298605b010f1c80041de884e777ea67 (patch)
treeea0e947f07d8818a955e8d257aba92c47d92ba12 /arch/parisc/kernel/irq.c
parent91400ac365da35b18036b46bdda27ddbcee4a663 (diff)
parent9bc181d8d7cb6462de0c315e364780ad275f7c57 (diff)
Merge branch 'rusty-cpumask-parisc' into parisc
Diffstat (limited to 'arch/parisc/kernel/irq.c')
-rw-r--r--arch/parisc/kernel/irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 1c740f5cbd63..4ea4229d765c 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);

Privacy Policy