From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435AbdFVQ4r (ORCPT ); Thu, 22 Jun 2017 12:56:47 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36209 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752493AbdFVQ4p (ORCPT ); Thu, 22 Jun 2017 12:56:45 -0400 Date: Thu, 22 Jun 2017 09:52:01 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, mingo@kernel.org, marc.zyngier@arm.com, keith.busch@intel.com, axboe@kernel.dk, mpe@ellerman.id.au, linux-kernel@vger.kernel.org, peterz@infradead.org, hch@lst.de, hpa@zytor.com Reply-To: peterz@infradead.org, hpa@zytor.com, hch@lst.de, mingo@kernel.org, tglx@linutronix.de, keith.busch@intel.com, marc.zyngier@arm.com, mpe@ellerman.id.au, linux-kernel@vger.kernel.org, axboe@kernel.dk In-Reply-To: <20170619235444.928501004@linutronix.de> References: <20170619235444.928501004@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Rename setup_affinity() to irq_setup_affinity() Git-Commit-ID: 43564bd97d0e6182bbd43b51b33254c728832551 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 Commit-ID: 43564bd97d0e6182bbd43b51b33254c728832551 Gitweb: http://git.kernel.org/tip/43564bd97d0e6182bbd43b51b33254c728832551 Author: Thomas Gleixner AuthorDate: Tue, 20 Jun 2017 01:37:22 +0200 Committer: Thomas Gleixner CommitDate: Thu, 22 Jun 2017 18:21:14 +0200 genirq: Rename setup_affinity() to irq_setup_affinity() Rename it with a proper irq_ prefix and make it available for other files in the core code. Preparatory patch for moving the irq affinity setup around. Signed-off-by: Thomas Gleixner Cc: Jens Axboe Cc: Marc Zyngier Cc: Michael Ellerman Cc: Keith Busch Cc: Peter Zijlstra Cc: Christoph Hellwig Link: http://lkml.kernel.org/r/20170619235444.928501004@linutronix.de --- kernel/irq/internals.h | 6 ++++++ kernel/irq/manage.c | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 33ca838..2d7927d 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -116,6 +116,12 @@ extern void irq_set_thread_affinity(struct irq_desc *desc); extern int irq_do_set_affinity(struct irq_data *data, const struct cpumask *dest, bool force); +#ifdef CONFIG_SMP +extern int irq_setup_affinity(struct irq_desc *desc); +#else +static inline int irq_setup_affinity(struct irq_desc *desc) { return 0; } +#endif + /* Inline functions for support of irq chips on slow busses */ static inline void chip_bus_lock(struct irq_desc *desc) { diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index e2f20d5..907fb79 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(irq_set_affinity_notifier); /* * Generic version of the affinity autoselector. */ -static int irq_setup_affinity(struct irq_desc *desc) +int irq_setup_affinity(struct irq_desc *desc) { struct cpumask *set = irq_default_affinity; int ret, node = irq_desc_get_node(desc); @@ -404,11 +404,6 @@ int irq_select_affinity_usr(unsigned int irq) raw_spin_unlock_irqrestore(&desc->lock, flags); return ret; } -#else -static inline int setup_affinity(struct irq_desc *desc) -{ - return 0; -} #endif /**