projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
[linux-2.6-block.git]
/
arch
/
powerpc
/
kernel
/
irq.c
diff --git
a/arch/powerpc/kernel/irq.c
b/arch/powerpc/kernel/irq.c
index 17efb7118db1140296bf8fa447b1b1133867c398..1b55ffdf002652d09376ce7e1a22d32c1101610f 100644
(file)
--- a/
arch/powerpc/kernel/irq.c
+++ b/
arch/powerpc/kernel/irq.c
@@
-231,7
+231,7
@@
void fixup_irqs(cpumask_t map)
if (irq_desc[irq].status & IRQ_PER_CPU)
continue;
- cpu
s_and(mask, irq_desc[irq].affinity,
map);
+ cpu
mask_and(&mask, irq_desc[irq].affinity, &
map);
if (any_online_cpu(mask) == NR_CPUS) {
printk("Breaking affinity for irq %i\n", irq);
mask = map;