git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
irq_64.c
diff --git
a/arch/sparc/kernel/irq_64.c
b/arch/sparc/kernel/irq_64.c
index
d0d6a51
..
5deabe9
100644
(file)
--- 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)
spin_lock_irqsave(&irq_rover_lock, flags);
while (!cpu_online(irq_rover)) {
spin_lock_irqsave(&irq_rover_lock, flags);
while (!cpu_online(irq_rover)) {
- if (++irq_rover >=
NR_CPUS
)
+ if (++irq_rover >=
nr_cpu_ids
)
irq_rover = 0;
}
cpuid = irq_rover;
do {
irq_rover = 0;
}
cpuid = irq_rover;
do {
- if (++irq_rover >=
NR_CPUS
)
+ if (++irq_rover >=
nr_cpu_ids
)
irq_rover = 0;
} while (!cpu_online(irq_rover));
irq_rover = 0;
} while (!cpu_online(irq_rover));