diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-11-17 23:39:31 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 19:24:28 +0100 |
| commit | ce378f7da8dd2fb6c5bb126505ea1d0c6cdc8eb5 (patch) | |
| tree | da7c159704ccf816ef7589064ab7210ad733f7f3 /arch/avr32 | |
| parent | Merge commit 'v2.6.32' (diff) | |
| download | linux-ce378f7da8dd2fb6c5bb126505ea1d0c6cdc8eb5.tar.xz linux-ce378f7da8dd2fb6c5bb126505ea1d0c6cdc8eb5.zip | |
avr32: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32')
| -rw-r--r-- | arch/avr32/include/asm/hardirq.h | 19 | ||||
| -rw-r--r-- | arch/avr32/kernel/irq.c | 9 |
2 files changed, 1 insertions, 27 deletions
diff --git a/arch/avr32/include/asm/hardirq.h b/arch/avr32/include/asm/hardirq.h index 015bc75ea798..9e36e3ff77d2 100644 --- a/arch/avr32/include/asm/hardirq.h +++ b/arch/avr32/include/asm/hardirq.h @@ -1,23 +1,6 @@ #ifndef __ASM_AVR32_HARDIRQ_H #define __ASM_AVR32_HARDIRQ_H - -#include <linux/threads.h> -#include <asm/irq.h> - #ifndef __ASSEMBLY__ - -#include <linux/cache.h> - -/* entry.S is sensitive to the offsets of these fields */ -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -void ack_bad_irq(unsigned int irq); - -/* Standard mappings for irq_cpustat_t above */ -#include <linux/irq_cpustat.h> - +#include <asm-generic/hardirq.h> #endif /* __ASSEMBLY__ */ - #endif /* __ASM_AVR32_HARDIRQ_H */ diff --git a/arch/avr32/kernel/irq.c b/arch/avr32/kernel/irq.c index 9f572229d318..09904d22309f 100644 --- a/arch/avr32/kernel/irq.c +++ b/arch/avr32/kernel/irq.c @@ -16,15 +16,6 @@ #include <linux/seq_file.h> #include <linux/sysdev.h> -/* - * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves. - */ -void ack_bad_irq(unsigned int irq) -{ - printk("unexpected IRQ %u\n", irq); -} - /* May be overridden by platform code */ int __weak nmi_enable(void) { |