diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2009-04-01 21:43:14 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-04-01 21:43:14 -0400 |
| commit | 7cec2ef4a298605b010f1c80041de884e777ea67 (patch) | |
| tree | ea0e947f07d8818a955e8d257aba92c47d92ba12 /arch/parisc/kernel/irq.c | |
| parent | 91400ac365da35b18036b46bdda27ddbcee4a663 (diff) | |
| parent | 9bc181d8d7cb6462de0c315e364780ad275f7c57 (diff) | |
Merge branch 'rusty-cpumask-parisc' into parisc
Diffstat (limited to 'arch/parisc/kernel/irq.c')
| -rw-r--r-- | arch/parisc/kernel/irq.c | 4 |
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) | |||
| 311 | next_cpu++; /* assign to "next" CPU we want this bugger on */ | 311 | next_cpu++; /* assign to "next" CPU we want this bugger on */ |
| 312 | 312 | ||
| 313 | /* validate entry */ | 313 | /* validate entry */ |
| 314 | while ((next_cpu < NR_CPUS) && | 314 | while ((next_cpu < nr_cpu_ids) && |
| 315 | (!per_cpu(cpu_data, next_cpu).txn_addr || | 315 | (!per_cpu(cpu_data, next_cpu).txn_addr || |
| 316 | !cpu_online(next_cpu))) | 316 | !cpu_online(next_cpu))) |
| 317 | next_cpu++; | 317 | next_cpu++; |
| 318 | 318 | ||
| 319 | if (next_cpu >= NR_CPUS) | 319 | if (next_cpu >= nr_cpu_ids) |
| 320 | next_cpu = 0; /* nothing else, assign monarch */ | 320 | next_cpu = 0; /* nothing else, assign monarch */ |
| 321 | 321 | ||
| 322 | return txn_affinity_addr(virt_irq, next_cpu); | 322 | return txn_affinity_addr(virt_irq, next_cpu); |