diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 18:44:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 18:44:22 -0400 |
| commit | ed223129a30de7d244ca9b59819f5532c9caf039 (patch) | |
| tree | 9ea5649276c18f13356c4db1663368e071081a25 /arch/sparc/kernel/irq_64.c | |
| parent | ffaba674090f287afe0c44fd8d978c64c03581a8 (diff) | |
| parent | 81f1adf01224f5c0be5f90f43664f799c1f7bb2d (diff) | |
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc
Conflicts:
arch/sparc/kernel/smp_64.c
Diffstat (limited to 'arch/sparc/kernel/irq_64.c')
| -rw-r--r-- | arch/sparc/kernel/irq_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index d0d6a515499a..5deabe921a47 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c | |||
| @@ -266,12 +266,12 @@ static int irq_choose_cpu(unsigned int virt_irq) | |||
| 266 | spin_lock_irqsave(&irq_rover_lock, flags); | 266 | spin_lock_irqsave(&irq_rover_lock, flags); |
| 267 | 267 | ||
| 268 | while (!cpu_online(irq_rover)) { | 268 | while (!cpu_online(irq_rover)) { |
| 269 | if (++irq_rover >= NR_CPUS) | 269 | if (++irq_rover >= nr_cpu_ids) |
| 270 | irq_rover = 0; | 270 | irq_rover = 0; |
| 271 | } | 271 | } |
| 272 | cpuid = irq_rover; | 272 | cpuid = irq_rover; |
| 273 | do { | 273 | do { |
| 274 | if (++irq_rover >= NR_CPUS) | 274 | if (++irq_rover >= nr_cpu_ids) |
| 275 | irq_rover = 0; | 275 | irq_rover = 0; |
| 276 | } while (!cpu_online(irq_rover)); | 276 | } while (!cpu_online(irq_rover)); |
| 277 | 277 | ||