Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751858Ab0H3EEV (ORCPT ); Mon, 30 Aug 2010 00:04:21 -0400 Received: from LUNGE.MIT.EDU ([18.54.1.69]:57996 "EHLO lunge.queued.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750721Ab0H3EET (ORCPT ); Mon, 30 Aug 2010 00:04:19 -0400 Date: Mon, 30 Aug 2010 00:06:14 -0400 From: Andres Salomon To: devicetree-discuss@lists.ozlabs.org Cc: sparclinux@vger.kernel.org, x86@kernel.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, cjb@laptop.org, Mitch Bradley , pgf@laptop.org, linux-kernel@vger.kernel.org, davem@davemloft.net, grant.likely@secretlab.ca, Stephen Neuendorffer Subject: [PATCH 8/9] x86: of: irq additions to make drivers/of/* build on x86 Message-ID: <20100830000614.0d571f10@debxo> In-Reply-To: <20100829235100.6dcedcb8@debxo> References: <20100628215407.2017bf2f@debian> <20100829235100.6dcedcb8@debxo> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2203 Lines: 74 This functionality overlaps with patches previously submitted by Stephen Neuendorffer. I don't care whose eventually get applied, so long as drivers/of/* becomes buildable on x86. Signed-off-by: Andres Salomon --- arch/x86/include/asm/irq.h | 5 +++++ arch/x86/kernel/irq.c | 8 ++++++++ include/linux/of_irq.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index 5458380..0a656b9 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -10,6 +10,11 @@ #include #include +#define NO_IRQ 0 + +/* 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 91fd0c7..d53f639 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -275,6 +276,13 @@ void smp_x86_platform_ipi(struct pt_regs *regs) EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq); +unsigned int irq_create_of_mapping(struct device_node *controller, + const u32 *intspec, unsigned int intsize) +{ + return intspec[0] + 1; +} +EXPORT_SYMBOL_GPL(irq_create_of_mapping); + #ifdef CONFIG_HOTPLUG_CPU /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ void fixup_irqs(void) diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 5929781..05ad27b 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -5,6 +5,7 @@ struct of_irq; #include #include +#include #include #include -- 1.5.6.5 -- 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/