diff options
author | Christoph Hellwig <hch@lst.de> | 2009-08-04 10:52:44 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-15 19:43:36 -0400 |
commit | d668bf0a0d73daea4eaaf748435752f52cc077aa (patch) | |
tree | 2f0d7effbaa82ee6cb11e4f5495001f8e7578e48 /arch/m68k/include/asm/hardirq_no.h | |
parent | f3aa42c6b26f502f6502ea2e07908d5768a3dd35 (diff) |
m68knommu: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/hardirq_no.h')
-rw-r--r-- | arch/m68k/include/asm/hardirq_no.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/m68k/include/asm/hardirq_no.h b/arch/m68k/include/asm/hardirq_no.h index bfad28149a49..b44b14be87d9 100644 --- a/arch/m68k/include/asm/hardirq_no.h +++ b/arch/m68k/include/asm/hardirq_no.h | |||
@@ -1,16 +1,8 @@ | |||
1 | #ifndef __M68K_HARDIRQ_H | 1 | #ifndef __M68K_HARDIRQ_H |
2 | #define __M68K_HARDIRQ_H | 2 | #define __M68K_HARDIRQ_H |
3 | 3 | ||
4 | #include <linux/cache.h> | ||
5 | #include <linux/threads.h> | ||
6 | #include <asm/irq.h> | 4 | #include <asm/irq.h> |
7 | 5 | ||
8 | typedef struct { | ||
9 | unsigned int __softirq_pending; | ||
10 | } ____cacheline_aligned irq_cpustat_t; | ||
11 | |||
12 | #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ | ||
13 | |||
14 | #define HARDIRQ_BITS 8 | 6 | #define HARDIRQ_BITS 8 |
15 | 7 | ||
16 | /* | 8 | /* |
@@ -22,6 +14,6 @@ typedef struct { | |||
22 | # error HARDIRQ_BITS is too low! | 14 | # error HARDIRQ_BITS is too low! |
23 | #endif | 15 | #endif |
24 | 16 | ||
25 | void ack_bad_irq(unsigned int irq); | 17 | #include <asm-generic/hardirq.h> |
26 | 18 | ||
27 | #endif /* __M68K_HARDIRQ_H */ | 19 | #endif /* __M68K_HARDIRQ_H */ |