Patchwork [1/1] sparc32: convert to asm-generic/hardirq.h

login
register
mail settings
Submitter Andrew Morton
Date Sept. 25, 2009, 10:19 p.m.
Message ID <20090925151932.3bcd5363.akpm@linux-foundation.org>
Download mbox | patch
Permalink /patch/34321/
State Superseded
Delegated to: David Miller
Headers show

Comments

Andrew Morton - Sept. 25, 2009, 10:19 p.m.
On Fri, 25 Sep 2009 14:59:47 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Fri, 25 Sep 2009 14:56:18 -0700
> 
> > Dave, could you please send along the config which broke Christoph's
> > patch?  It works OK with allnoconfig and defconfig for me.
> 
> arch/sparc/configs/sparc32_defconfig


OK.

In file included from include/asm-generic/hardirq.h:6,
                 from /usr/src/devel/arch/sparc/include/asm/hardirq_32.h:11,
                 from /usr/src/devel/arch/sparc/include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:10,
                 from include/linux/interrupt.h:12,
                 from /usr/src/devel/arch/sparc/include/asm/irq_32.h:9,
                 from /usr/src/devel/arch/sparc/include/asm/irq.h:6,
                 from include/linux/nmi.h:8,
                 from kernel/sched.c:31:

How's this fix look?

 arch/sparc/include/asm/irq_32.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
David Miller - Sept. 25, 2009, 10:28 p.m.
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 25 Sep 2009 15:19:32 -0700

> How's this fix look?

Can you send me the respinned original patch with this fix in it?  I
can test and integrate that much more easily.

Thanks Andrew!
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -puN arch/sparc/include/asm/irq_32.h~a arch/sparc/include/asm/irq_32.h
--- a/arch/sparc/include/asm/irq_32.h~a
+++ a/arch/sparc/include/asm/irq_32.h
@@ -6,10 +6,10 @@ 
 #ifndef _SPARC_IRQ_H
 #define _SPARC_IRQ_H
 
-#include <linux/interrupt.h>
-
 #define NR_IRQS    16
 
+#include <linux/interrupt.h>
+
 #define irq_canonicalize(irq)	(irq)
 
 extern void __init init_IRQ(void);