From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031658AbbDXQCW (ORCPT ); Fri, 24 Apr 2015 12:02:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45010 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031622AbbDXQCR (ORCPT ); Fri, 24 Apr 2015 12:02:17 -0400 Date: Fri, 24 Apr 2015 09:01:16 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: yinghai@kernel.org, rjw@rjwysocki.net, bhelgaas@google.com, linux@eikelenboom.it, sivanich@sgi.com, gregkh@linuxfoundation.org, hpa@zytor.com, joro@8bytes.org, jroedel@suse.de, tony.luck@intel.com, benh@kernel.crashing.org, bp@alien8.de, konrad.wilk@oracle.com, tglx@linutronix.de, david.a.cohen@linux.intel.com, mingo@kernel.org, david.vrabel@citrix.com, jiang.liu@linux.intel.com, rdunlap@infradead.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, rdunlap@infradead.org, jiang.liu@linux.intel.com, mingo@kernel.org, david.vrabel@citrix.com, david.a.cohen@linux.intel.com, konrad.wilk@oracle.com, tglx@linutronix.de, bp@alien8.de, benh@kernel.crashing.org, tony.luck@intel.com, joro@8bytes.org, jroedel@suse.de, hpa@zytor.com, gregkh@linuxfoundation.org, sivanich@sgi.com, linux@eikelenboom.it, bhelgaas@google.com, rjw@rjwysocki.net, yinghai@kernel.org In-Reply-To: <1428978610-28986-24-git-send-email-jiang.liu@linux.intel.com> References: <1428978610-28986-24-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Make functions only used in vector.c static Git-Commit-ID: f970510cc55e41d21ca30feb56873aaeb57ec18d 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: f970510cc55e41d21ca30feb56873aaeb57ec18d Gitweb: http://git.kernel.org/tip/f970510cc55e41d21ca30feb56873aaeb57ec18d Author: Jiang Liu AuthorDate: Tue, 14 Apr 2015 10:30:00 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:54 +0200 x86/irq: Make functions only used in vector.c static Function {assign|clear}_irq_vector() and apic_retrigger_irq() are only used in vector.c, so make them static. 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-24-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/hw_irq.h | 3 --- arch/x86/kernel/apic/vector.c | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index bb2c990..9a79768 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -188,8 +188,6 @@ extern struct irq_cfg *irq_cfg(unsigned int irq); extern struct irq_cfg *irqd_cfg(struct irq_data *irq_data); extern void lock_vector_lock(void); extern void unlock_vector_lock(void); -extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *); -extern void clear_irq_vector(int irq, struct irq_cfg *cfg); extern void setup_vector_irq(int cpu); #ifdef CONFIG_SMP extern void send_cleanup_vector(struct irq_cfg *); @@ -199,7 +197,6 @@ static inline void send_cleanup_vector(struct irq_cfg *c) { } static inline void irq_complete_move(struct irq_cfg *c) { } #endif -extern int apic_retrigger_irq(struct irq_data *data); 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); diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index 51cd46b..d52af4d 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -185,7 +185,8 @@ next: return err; } -int assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) +static int assign_irq_vector(int irq, struct irq_cfg *cfg, + const struct cpumask *mask) { int err; unsigned long flags; @@ -196,7 +197,7 @@ int assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) return err; } -void clear_irq_vector(int irq, struct irq_cfg *cfg) +static void clear_irq_vector(int irq, struct irq_cfg *cfg) { int cpu, vector; unsigned long flags; @@ -441,7 +442,7 @@ void setup_vector_irq(int cpu) __setup_vector_irq(cpu); } -int apic_retrigger_irq(struct irq_data *data) +static int apic_retrigger_irq(struct irq_data *data) { struct irq_cfg *cfg = irqd_cfg(data); unsigned long flags;