Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755912Ab0LPC6V (ORCPT ); Wed, 15 Dec 2010 21:58:21 -0500 Received: from hera.kernel.org ([140.211.167.34]:52676 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755148Ab0LPC6Q (ORCPT ); Wed, 15 Dec 2010 21:58:16 -0500 Date: Thu, 16 Dec 2010 02:57:57 GMT From: tip-bot for Andres Salomon Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, dilinger@queued.net, tglx@linutronix.de, hpa@linux.intel.com Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, dilinger@queued.net, tglx@linutronix.de, hpa@linux.intel.com In-Reply-To: <20101111214526.5de7121b@queued.net> References: <20101111214526.5de7121b@queued.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/olpc] x86, of: Define irq functions to allow drivers/of/* to build on x86 Message-ID: Git-Commit-ID: 4722d194e648fb5755faecee895b96b26f9732f3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Thu, 16 Dec 2010 02:57:58 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2644 Lines: 75 Commit-ID: 4722d194e648fb5755faecee895b96b26f9732f3 Gitweb: http://git.kernel.org/tip/4722d194e648fb5755faecee895b96b26f9732f3 Author: Andres Salomon AuthorDate: Fri, 12 Nov 2010 05:45:26 +0000 Committer: H. Peter Anvin CommitDate: Wed, 15 Dec 2010 17:11:16 -0800 x86, of: Define irq functions to allow drivers/of/* to build on x86 - Define a stub irq_create_of_mapping for x86 as a stop-gap solution until drivers/of/irq is further along. - Define irq_dispose_mapping for x86 to appease of_i2c.c These are needed to allow stuff in drivers/of/ to build on x86. This stuff will eventually get replaced; quoting Grant, "The long term plan is to have the drivers/of/ code handling the mapping intelligently like powerpc currently does." But for now, just provide these functions. Signed-off-by: Andres Salomon LKML-Reference: <20101111214526.5de7121b@queued.net> Signed-off-by: H. Peter Anvin --- arch/x86/include/asm/irq.h | 3 +++ arch/x86/kernel/irq.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index 13b0eba..8d2c671 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -10,6 +10,9 @@ #include #include +/* Even though we don't support this, supply it to appease OF */ +static inline void irq_dispose_mapping(unsigned int virq) { } + static inline int irq_canonicalize(int irq) { return ((irq == 2) ? 9 : irq); diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 83ec017..d833d1b 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -275,6 +276,15 @@ void smp_x86_platform_ipi(struct pt_regs *regs) EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq); +#ifdef CONFIG_OF +unsigned int irq_create_of_mapping(struct device_node *controller, + const u32 *intspec, unsigned int intsize) +{ + return intspec[0]; +} +EXPORT_SYMBOL_GPL(irq_create_of_mapping); +#endif + #ifdef CONFIG_HOTPLUG_CPU /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ void fixup_irqs(void) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/