Subject: Re: linux-next: build warning after merge of the devicetree tree

From: Grant Likely <[email-masked]>
Date: Wed, 20 Oct 2010 21:26:57 -0600

On Thu, Oct 21, 2010 at 01:37:26PM +1100, Stephen Rothwell wrote:
> Hi Grant,
> 
> After merging the devicetree tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
> 
> arch/x86/kernel/irq.c:280: warning: 'struct device_node' declared inside parameter list
> 
> Introduced by commit 27f4e2b1060be8bc38146fd30986e7c2858e2a5f ("x86/of:
> define irq functions to allow drivers/of/* to build on x86").  This build
> has CONFIG_OF not set.

Thanks Stephen.  Does the following patch fix things?

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 4417f49..23216f7 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -276,12 +276,14 @@ 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. */