From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966805AbbDXQCm (ORCPT ); Fri, 24 Apr 2015 12:02:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45046 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966668AbbDXQCh (ORCPT ); Fri, 24 Apr 2015 12:02:37 -0400 Date: Fri, 24 Apr 2015 09:01:33 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: david.vrabel@citrix.com, jroedel@suse.de, rdunlap@infradead.org, linux@eikelenboom.it, tglx@linutronix.de, hpa@zytor.com, yinghai@kernel.org, bhelgaas@google.com, david.a.cohen@linux.intel.com, joro@8bytes.org, tony.luck@intel.com, jiang.liu@linux.intel.com, benh@kernel.crashing.org, rjw@rjwysocki.net, gregkh@linuxfoundation.org, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, bp@alien8.de, sivanich@sgi.com, mingo@kernel.org Reply-To: mingo@kernel.org, sivanich@sgi.com, rjw@rjwysocki.net, gregkh@linuxfoundation.org, konrad.wilk@oracle.com, bp@alien8.de, linux-kernel@vger.kernel.org, tony.luck@intel.com, joro@8bytes.org, jiang.liu@linux.intel.com, benh@kernel.crashing.org, bhelgaas@google.com, david.a.cohen@linux.intel.com, yinghai@kernel.org, linux@eikelenboom.it, rdunlap@infradead.org, tglx@linutronix.de, hpa@zytor.com, david.vrabel@citrix.com, jroedel@suse.de In-Reply-To: <1428978610-28986-25-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-25-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Remove function apic_set_affinity() Git-Commit-ID: 68f9f4404d74f859dc84973db8731b41a51d929a 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: 68f9f4404d74f859dc84973db8731b41a51d929a Gitweb: http://git.kernel.org/tip/68f9f4404d74f859dc84973db8731b41a51d929a Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:30:01 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:54 +0200 x86/irq: Remove function apic_set_affinity() Now there's no user of apic_set_affinity(), so remove it. Also rename vector_set_affinity() to apic_set_affinity() for consistency. Signed-off-by: Jiang Liu Tested-by: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Link: http://lkml.kernel.org/r/1428978610-28986-25-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/hw_irq.h | 2 -- arch/x86/kernel/apic/vector.c | 40 +++------------------------------------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 9a79768..727c623 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -198,8 +198,6 @@ static inline void irq_complete_move(struct irq_cfg *c) { } #endif extern void apic_ack_edge(struct irq_data *data); -extern int apic_set_affinity(struct irq_data *data, const struct cpumask *mask, - unsigned int *dest_id); #else /* CONFIG_X86_LOCAL_APIC */ static inline void lock_vector_lock(void) {} static inline void unlock_vector_lock(void) {} diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index d52af4d..1aea62d 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -463,42 +463,8 @@ void apic_ack_edge(struct irq_data *data) ack_APIC_irq(); } -/* - * Either sets data->affinity to a valid value, and returns - * ->cpu_mask_to_apicid of that in dest_id, or returns -1 and - * leaves data->affinity untouched. - */ -int apic_set_affinity(struct irq_data *data, const struct cpumask *mask, - unsigned int *dest_id) -{ - struct irq_cfg *cfg = irqd_cfg(data); - unsigned int irq = data->irq; - int err; - - if (!config_enabled(CONFIG_SMP)) - return -EPERM; - - if (!cpumask_intersects(mask, cpu_online_mask)) - return -EINVAL; - - err = assign_irq_vector(irq, cfg, mask); - if (err) - return err; - - err = apic->cpu_mask_to_apicid_and(mask, cfg->domain, dest_id); - if (err) { - if (assign_irq_vector(irq, cfg, data->affinity)) - pr_err("Failed to recover vector for irq %d\n", irq); - return err; - } - - cpumask_copy(data->affinity, mask); - - return 0; -} - -static int vector_set_affinity(struct irq_data *irq_data, - const struct cpumask *dest, bool force) +static int apic_set_affinity(struct irq_data *irq_data, + const struct cpumask *dest, bool force) { struct irq_cfg *cfg = irq_data->chip_data; int err, irq = irq_data->irq; @@ -523,7 +489,7 @@ static int vector_set_affinity(struct irq_data *irq_data, static struct irq_chip lapic_controller = { .irq_ack = apic_ack_edge, - .irq_set_affinity = vector_set_affinity, + .irq_set_affinity = apic_set_affinity, .irq_retrigger = apic_retrigger_irq, };