lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc

Browse Source 
Conflicts:
	arch/sparc/kernel/smp_64.c
This commit is contained in:
David S. Miller
2009-03-29 15:44:22 -07:00
parent ffaba67409 81f1adf012
commit ed223129a3
14 changed files with 50 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/kernel/irq_64.c
View File

@ -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)) {
if (++irq_rover >= NR_CPUS)
if (++irq_rover >= nr_cpu_ids)
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));