Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/powerpc/kernel/irq.c between commit
e65e49d0f3714f4a6a42f6f6a19926ba33fcda75 ("irq: update all arches for new
irq_desc") from the x86 and cpus4096 trees and commit
1fd095952e0ed03be0cda5341501984bcfe57c22
("cpumask:all-ops-compare-against-nr_cpu_ids-powerpc") from the rr tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/powerpc/kernel/irq.c
index 1b55ffd,7573591..0000000
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@@ -231,8 -231,8 +231,8 @@@ void fixup_irqs(cpumask_t map
if (irq_desc[irq].status & IRQ_PER_CPU)
continue;
- cpus_and(mask, irq_desc[irq].affinity, map);
+ cpumask_and(&mask, irq_desc[irq].affinity, &map);
- if (any_online_cpu(mask) == NR_CPUS) {
+ if (cpumask_any_and(&mask, cpu_online_mask) >= nr_cpu_ids) {
printk("Breaking affinity for irq %i\n", irq);
mask = map;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
