[1/1,resend] irq: Maintain user set affinity

Message ID Pine.LNX.4.64.0811041053400.17102@blarg.am.freescale.net
State Superseded, archived
Headers show

Commit Message

Kumar Gala Nov. 4, 2008, 4:54 p.m.
This addresses a regression in that if a user specified an affinity
for an interrupt that affinity information would get reset between
a request_irq(), free_irq() and request_irq() for the same irq.

On example of this is bringing up an ethernet interface, taking
it down and bringing it back up again.

Instead of always using the irq_default_affinity we use the
previous setting of the IRQs affinity with the assumption that
at boot the IRQs affinity will be set to irq_default_affinity.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

reposting since the first patch I forgot to cull some header info from the
body of the emai.

- k

 kernel/irq/manage.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index c498a1b..ea7d11b 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -115,9 +115,12 @@  int irq_select_affinity(unsigned int irq)
 	if (!irq_can_set_affinity(irq))
 		return 0;

-	cpus_and(mask, cpu_online_map, irq_default_affinity);
 	desc = irq_to_desc(irq);
+	mask = desc->affinity;
+	cpus_and(mask, cpu_online_map, mask);
 	desc->affinity = mask;
 	desc->chip->set_affinity(irq, mask);