Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756700AbYKDQcL (ORCPT ); Tue, 4 Nov 2008 11:32:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754720AbYKDQb5 (ORCPT ); Tue, 4 Nov 2008 11:31:57 -0500 Received: from gate.crashing.org ([63.228.1.57]:34849 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754021AbYKDQb5 (ORCPT ); Tue, 4 Nov 2008 11:31:57 -0500 Date: Tue, 4 Nov 2008 10:31:05 -0600 (CST) From: Kumar Gala X-X-Sender: galak@blarg.am.freescale.net To: Linus Torvalds cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, Andrew Morton , linuxppc-dev@ozlabs.org Subject: [PATCH 1/1] irq: Maintain user set affinity Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1571 Lines: 48 >From 819ad3ed4660f4238e053728a8b5aa93d22b13d7 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 4 Nov 2008 10:13:53 -0600 Subject: [PATCH 1/1] irq: Maintain user set affinity 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 --- 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); -- 1.5.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/