Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751806AbbLUONh (ORCPT ); Mon, 21 Dec 2015 09:13:37 -0500 Received: from hqemgate15.nvidia.com ([216.228.121.64]:4872 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673AbbLUONR (ORCPT ); Mon, 21 Dec 2015 09:13:17 -0500 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Mon, 21 Dec 2015 05:58:16 -0800 From: Jon Hunter To: Thomas Gleixner , Jason Cooper , Marc Zyngier CC: linux-kernel@vger.kernel.org, Jon Hunter Subject: [PATCH 2/2] irqchip/gic: Only populate set_affinity for the root controller Date: Mon, 21 Dec 2015 14:13:10 +0000 Message-ID: <1450707190-29069-2-git-send-email-jonathanh@nvidia.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450707190-29069-1-git-send-email-jonathanh@nvidia.com> References: <1450707190-29069-1-git-send-email-jonathanh@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1852 Lines: 52 Setting the affinity of an IRQ, it only applicable for the root interrupt controller and so only populate this operator for the root controller. Signed-off-by: Jon Hunter --- drivers/irqchip/irq-gic.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 94ad60c424a7..53b03f6038c1 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -384,9 +384,6 @@ static struct irq_chip gic_chip = { .irq_unmask = gic_unmask_irq, .irq_eoi = gic_eoi_irq, .irq_set_type = gic_set_type, -#ifdef CONFIG_SMP - .irq_set_affinity = gic_set_affinity, -#endif .irq_get_irqchip_state = gic_irq_get_irqchip_state, .irq_set_irqchip_state = gic_irq_set_irqchip_state, .flags = IRQCHIP_SET_TYPE_MASKED | @@ -1017,10 +1014,16 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start, gic->chip.name = kasprintf(GFP_KERNEL, "GIC-%d", gic_nr); /* Initialize irq_chip */ - if (static_key_true(&supports_deactivate) && gic_nr == 0) { - gic->chip.irq_mask = gic_eoimode1_mask_irq; - gic->chip.irq_eoi = gic_eoimode1_eoi_irq; - gic->chip.irq_set_vcpu_affinity = gic_irq_set_vcpu_affinity; + if (gic_nr == 0) { + if (IS_ENABLED(CONFIG_SMP)) + gic->chip.irq_set_affinity = gic_set_affinity; + + if (static_key_true(&supports_deactivate)) { + gic->chip.irq_mask = gic_eoimode1_mask_irq; + gic->chip.irq_eoi = gic_eoimode1_eoi_irq; + gic->chip.irq_set_vcpu_affinity = + gic_irq_set_vcpu_affinity; + } } #ifdef CONFIG_GIC_NON_BANKED -- 2.1.4 -- 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/