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

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

[Christoph Hellwig]

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6/arch/sparc/include/asm/hardirq_32.h
===================================================================
--- linux-2.6.orig/arch/sparc/include/asm/hardirq_32.h	2009-07-27 14:37:54.393922856 +0200
+++ linux-2.6/arch/sparc/include/asm/hardirq_32.h	2009-07-27 14:57:42.583901007 +0200
@@ -7,17 +7,7 @@
 #ifndef __SPARC_HARDIRQ_H
 #define __SPARC_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/spinlock.h>
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
 #define HARDIRQ_BITS    8
+#include <asm-generic/hardirq.h>
 
 #endif /* __SPARC_HARDIRQ_H */

Re: [PATCH] sparc32: convert to asm-generic/hardirq.h

[David Miller]

From: Christoph Hellwig <hch@lst.de>
Date: Tue, 4 Aug 2009 16:56:15 +0200

> Signed-off-by: Christoph Hellwig <hch@lst.de>

Applied, thanks.

Please post sparc patches at least CC:'d to sparclinux@vger.kernel.org
in the future.

Re: [PATCH] sparc32: convert to asm-generic/hardirq.h

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Sun, 16 Aug 2009 18:28:55 -0700 (PDT)

> From: Christoph Hellwig <hch@lst.de>
> Date: Tue, 4 Aug 2009 16:56:15 +0200
> 
>> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Applied, thanks.
> 
> Please post sparc patches at least CC:'d to sparclinux@vger.kernel.org
> in the future.

I have to revert this, it breaks the build.

  CC      init/main.o
In file included from include/asm-generic/hardirq.h:6,
                 from /home/davem/src/GIT/sparc-next-2.6/arch/sparc/include/asm/hardirq_32.h:11,
                 from /home/davem/src/GIT/sparc-next-2.6/arch/sparc/include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:10,
                 from include/linux/interrupt.h:12,
                 from /home/davem/src/GIT/sparc-next-2.6/arch/sparc/include/asm/irq_32.h:9,
                 from /home/davem/src/GIT/sparc-next-2.6/arch/sparc/include/asm/irq.h:6,
                 from include/linux/irqnr.h:10,
                 from include/linux/random.h:12,
                 from include/linux/stackprotector.h:6,
                 from init/main.c:17:
include/linux/irq.h:208: error: 'NR_IRQS' undeclared here (not in a function)
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2