diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-09-21 17:03:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 07:17:43 -0700 |
| commit | 6e0c9e77771e08b171c4abeb073285d8fb03f528 (patch) | |
| tree | 826c32f5e9e346e68b53e070284d06d1641f58db | |
| parent | eb8cdec4a984fde123a91250dcc9e0bddf5eafdc (diff) | |
| download | kernel-common-6e0c9e77771e08b171c4abeb073285d8fb03f528.tar.gz kernel-common-6e0c9e77771e08b171c4abeb073285d8fb03f528.tar.bz2 kernel-common-6e0c9e77771e08b171c4abeb073285d8fb03f528.zip | |
h8300: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/h8300/include/asm/hardirq.h | 15 | ||||
| -rw-r--r-- | arch/h8300/kernel/irq.c | 5 |
2 files changed, 3 insertions, 17 deletions
diff --git a/arch/h8300/include/asm/hardirq.h b/arch/h8300/include/asm/hardirq.h index 9d7f7a7462b2..c2e1aa0f0d14 100644 --- a/arch/h8300/include/asm/hardirq.h +++ b/arch/h8300/include/asm/hardirq.h @@ -1,18 +1,7 @@ #ifndef __H8300_HARDIRQ_H #define __H8300_HARDIRQ_H -#include <linux/kernel.h> -#include <linux/threads.h> -#include <linux/interrupt.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 */ - -extern void ack_bad_irq(unsigned int irq); +#include <asm/irq.h> #define HARDIRQ_BITS 8 @@ -25,4 +14,6 @@ extern void ack_bad_irq(unsigned int irq); # error HARDIRQ_BITS is too low! #endif +#include <asm-generic/hardirq.h> + #endif diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c index 74f8dd7b34d2..5c913d472119 100644 --- a/arch/h8300/kernel/irq.c +++ b/arch/h8300/kernel/irq.c @@ -81,11 +81,6 @@ struct irq_chip h8300irq_chip = { .end = h8300_end_irq, }; -void ack_bad_irq(unsigned int irq) -{ - printk("unexpected IRQ trap at vector %02x\n", irq); -} - #if defined(CONFIG_RAMKERNEL) static unsigned long __init *get_vector_address(void) { |