From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753117AbaLSOIh (ORCPT ); Fri, 19 Dec 2014 09:08:37 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46121 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753098AbaLSOIf (ORCPT ); Fri, 19 Dec 2014 09:08:35 -0500 Date: Fri, 19 Dec 2014 06:07:35 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: grant.likely@linaro.org, rjw@rjwysocki.net, tglx@linutronix.de, tony.luck@intel.com, konrad.wilk@oracle.com, jiang.liu@linux.intel.com, mingo@kernel.org, benh@kernel.crashing.org, yinghai@kernel.org, prarit@redhat.com, joro@8bytes.org, bp@alien8.de, linux-kernel@vger.kernel.org, bhelgaas@google.com, rdunlap@infradead.org, gregkh@linuxfoundation.org, hpa@zytor.com Reply-To: gregkh@linuxfoundation.org, hpa@zytor.com, bhelgaas@google.com, rdunlap@infradead.org, bp@alien8.de, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, yinghai@kernel.org, prarit@redhat.com, joro@8bytes.org, mingo@kernel.org, jiang.liu@linux.intel.com, konrad.wilk@oracle.com, tony.luck@intel.com, grant.likely@linaro.org, rjw@rjwysocki.net, tglx@linutronix.de In-Reply-To: <1414397531-28254-9-git-send-email-jiang.liu@linux.intel.com> References: <1414397531-28254-9-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86, irq: Introduce helpers to access struct irq_cfg Git-Commit-ID: 55a0e2b122c26c7496ea85754bceddc05dba402b 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: 55a0e2b122c26c7496ea85754bceddc05dba402b Gitweb: http://git.kernel.org/tip/55a0e2b122c26c7496ea85754bceddc05dba402b Author: Jiang Liu AuthorDate: Mon, 27 Oct 2014 16:11:59 +0800 Committer: Thomas Gleixner CommitDate: Tue, 16 Dec 2014 14:08:16 +0100 x86, irq: Introduce helpers to access struct irq_cfg Change irq_cfg() from static to extern, also introduce helper function irqd_cfg(). Later we can rewrite these two helpers when enabling hierarchy irqdomain. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Bjorn Helgaas Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Prarit Bhargava Cc: Grant Likely Link: http://lkml.kernel.org/r/1414397531-28254-9-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/io_apic.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index e1acbba..454c9e4 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -132,6 +132,8 @@ struct irq_cfg { }; }; +extern struct irq_cfg *irq_cfg(unsigned int irq); +extern struct irq_cfg *irqd_cfg(struct irq_data *irq_data); extern void setup_vector_irq(int cpu); extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *); #ifdef CONFIG_SMP diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index ab8ca9327..783468e 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -281,11 +281,16 @@ int __init arch_early_irq_init(void) return 0; } -static inline struct irq_cfg *irq_cfg(unsigned int irq) +struct irq_cfg *irq_cfg(unsigned int irq) { return irq_get_chip_data(irq); } +struct irq_cfg *irqd_cfg(struct irq_data *irq_data) +{ + return irq_data->chip_data; +} + static struct irq_cfg *alloc_irq_cfg(unsigned int irq, int node) { struct irq_cfg *cfg;