summaryrefslogtreecommitdiffstats
path: root/arch/m32r
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-09-21 17:04:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 07:17:43 -0700
commitef187fd799c50e15dbb56a0286c81bf467bd0201 (patch)
tree34753f6f10b3bd07c0d832c06338bfbdd73342b2 /arch/m32r
parent95ad759c6b0f30ad9aa5efbdbcecb9597238c00f (diff)
downloadblackbird-op-linux-ef187fd799c50e15dbb56a0286c81bf467bd0201.tar.gz
blackbird-op-linux-ef187fd799c50e15dbb56a0286c81bf467bd0201.zip
m32r: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m32r')
-rw-r--r--arch/m32r/include/asm/hardirq.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/m32r/include/asm/hardirq.h b/arch/m32r/include/asm/hardirq.h
index cb8aa762f235..4c31c0ae215e 100644
--- a/arch/m32r/include/asm/hardirq.h
+++ b/arch/m32r/include/asm/hardirq.h
@@ -2,14 +2,7 @@
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-typedef struct {
- unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
+#include <asm/irq.h>
#if NR_IRQS > 256
#define HARDIRQ_BITS 9
@@ -26,11 +19,7 @@ typedef struct {
# error HARDIRQ_BITS is too low!
#endif
-static inline void ack_bad_irq(int irq)
-{
- printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
- BUG();
-}
+#include <asm-generic/hardirq.h>
#endif /* __ASM_HARDIRQ_H */
#endif /* __KERNEL__ */
OpenPOWER on IntegriCloud