* linux-next: manual merge of the genirq tree with Linus' tree
@ 2009-05-18 1:25 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-05-18 1:25 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, Yinghai Lu, Thomas Bogendoerfer, Ralf Baechle
Hi all,
Today's linux-next merge of the genirq tree got a conflict in
arch/mips/sibyte/bcm1480/irq.c and arch/mips/sibyte/sb1250/irq.c between
commit 5d81b83d03eb32085c569854695e102dde7af544 ("MIPS: Sibyte: Fix
locking in set_irq_affinity") from Linus' tree and commit
d5dedd4507d307eb3f35f21b6e16f336fdc0d82a ("irq: change ->set_affinity()
to return status") from the genirq tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/mips/sibyte/bcm1480/irq.c
index c147c4b,4f256a1..0000000
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@@ -151,7 -153,10 +151,9 @@@ static int bcm1480_set_affinity(unsigne
____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
}
}
- spin_unlock(&bcm1480_imr_lock);
- spin_unlock_irqrestore(&desc->lock, flags);
+ spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
+
+ return 0;
}
#endif
diff --cc arch/mips/sibyte/sb1250/irq.c
index 38cb998,e389507..0000000
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@@ -142,7 -144,10 +142,9 @@@ static int sb1250_set_affinity(unsigne
____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
R_IMR_INTERRUPT_MASK));
}
- spin_unlock(&sb1250_imr_lock);
- spin_unlock_irqrestore(&desc->lock, flags);
+ spin_unlock_irqrestore(&sb1250_imr_lock, flags);
+
+ return 0;
}
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-18 1:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-18 1:25 linux-next: manual merge of the genirq tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox