Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461AbdGRHuP (ORCPT ); Tue, 18 Jul 2017 03:50:15 -0400 Received: from terminus.zytor.com ([65.50.211.136]:60859 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751334AbdGRHuN (ORCPT ); Tue, 18 Jul 2017 03:50:13 -0400 Date: Tue, 18 Jul 2017 00:48:51 -0700 From: tip-bot for Matt Redfearn Message-ID: Cc: marc.zyngier@arm.com, linux-kernel@vger.kernel.org, jason@lakedaemon.net, matt.redfearn@imgtec.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com Reply-To: matt.redfearn@imgtec.com, jason@lakedaemon.net, marc.zyngier@arm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1500363561-32213-1-git-send-email-matt.redfearn@imgtec.com> References: <1500363561-32213-1-git-send-email-matt.redfearn@imgtec.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] irqchip/mips-gic: Remove population of irq domain names Git-Commit-ID: ddac9c5bfa75029ed4b58e81d8d3c49694598ff6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2320 Lines: 54 Commit-ID: ddac9c5bfa75029ed4b58e81d8d3c49694598ff6 Gitweb: http://git.kernel.org/tip/ddac9c5bfa75029ed4b58e81d8d3c49694598ff6 Author: Matt Redfearn AuthorDate: Tue, 18 Jul 2017 08:39:21 +0100 Committer: Thomas Gleixner CommitDate: Tue, 18 Jul 2017 09:45:28 +0200 irqchip/mips-gic: Remove population of irq domain names Since commit d59f6617eef0f ("genirq: Allow fwnode to carry name information only") the irqdomain core sets the names of irq domains. When the name is allocated the new IRQ_DOMAIN_NAME_ALLOCATED flag is set. Replacing the allocated name with a constant one is not a good idea, since calling the new irq_domain_update_bus_token() API, added to the MIPS GIC driver by commit 96f0d93a487e1 ("irqchip/MSI: Use irq_domain_update_bus_token instead of an open coded access") will attempt to kfree the pointer, and result in a kernel OOPS. Fix this by removing the names, now that they are set by the irqdomain core. This effectively reverts commit 21c57fd13589 ("irqchip/mips-gic: Populate irq_domain names"). Fixes: d59f6617eef0f ("genirq: Allow fwnode to carry name information only") Signed-off-by: Matt Redfearn Signed-off-by: Thomas Gleixner Cc: Marc Zyngier Cc: linux-mips@linux-mips.org Cc: Jason Cooper Link: http://lkml.kernel.org/r/1500363561-32213-1-git-send-email-matt.redfearn@imgtec.com --- drivers/irqchip/irq-mips-gic.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 832ebf40..6ab1d3a 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c @@ -950,7 +950,6 @@ static void __init __gic_init(unsigned long gic_base_addr, &gic_irq_domain_ops, NULL); if (!gic_irq_domain) panic("Failed to add GIC IRQ domain"); - gic_irq_domain->name = "mips-gic-irq"; gic_ipi_domain = irq_domain_add_hierarchy(gic_irq_domain, IRQ_DOMAIN_FLAG_IPI_PER_CPU, @@ -959,7 +958,6 @@ static void __init __gic_init(unsigned long gic_base_addr, if (!gic_ipi_domain) panic("Failed to add GIC IPI domain"); - gic_ipi_domain->name = "mips-gic-ipi"; irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI); if (node &&