From patchwork Mon Sep 28 22:55:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] sparc32: convert to asm-generic/hardirq.h Date: Mon, 28 Sep 2009 12:55:22 -0000 From: Andrew Morton X-Patchwork-Id: 34404 Message-Id: <200909282255.n8SMtMaa015542@imap1.linux-foundation.org> To: davem@davemloft.net Cc: sparclinux@vger.kernel.org, akpm@linux-foundation.org, hch@lst.de, sam@ravnborg.org From: Christoph Hellwig [akpm@linux-foundation.org: /arch/sparc/include/asm/irq_32.h: move NR_IRQS definition] Signed-off-by: Christoph Hellwig Cc: "David S. Miller" Cc: Sam Ravnborg Signed-off-by: Andrew Morton --- arch/sparc/include/asm/hardirq_32.h | 12 +----------- arch/sparc/include/asm/irq_32.h | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff -puN arch/sparc/include/asm/hardirq_32.h~sparc32-convert-to-asm-generic-hardirqh arch/sparc/include/asm/hardirq_32.h --- a/arch/sparc/include/asm/hardirq_32.h~sparc32-convert-to-asm-generic-hardirqh +++ a/arch/sparc/include/asm/hardirq_32.h @@ -7,17 +7,7 @@ #ifndef __SPARC_HARDIRQ_H #define __SPARC_HARDIRQ_H -#include -#include -#include - -/* 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 /* Standard mappings for irq_cpustat_t above */ - #define HARDIRQ_BITS 8 +#include #endif /* __SPARC_HARDIRQ_H */ diff -puN arch/sparc/include/asm/irq_32.h~sparc32-convert-to-asm-generic-hardirqh arch/sparc/include/asm/irq_32.h --- a/arch/sparc/include/asm/irq_32.h~sparc32-convert-to-asm-generic-hardirqh +++ a/arch/sparc/include/asm/irq_32.h @@ -6,10 +6,10 @@ #ifndef _SPARC_IRQ_H #define _SPARC_IRQ_H -#include - #define NR_IRQS 16 +#include + #define irq_canonicalize(irq) (irq) extern void __init init_IRQ(void);