diff options
author | Christoph Hellwig <hch@lst.de> | 2009-08-04 10:49:52 -0400 |
---|---|---|
committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2009-09-01 11:23:32 -0400 |
commit | 0395ac6447c05e9393d4f8187ea6588b9d1daeb7 (patch) | |
tree | ab2f9a76a79c1d38b74dd7f3a39a39c0f135d387 /arch/cris | |
parent | e6cd19743bfc76ca81804c2a259e3a0d7b03fd73 (diff) |
CRIS: convert to asm-generic/hardirq.h
Convert CRIS to use asm-generic/hardirq.h
Also remove unneeded (incorrect) prototypes for setup_irq().
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 1 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 1 | ||||
-rw-r--r-- | arch/cris/include/asm/hardirq.h | 12 | ||||
-rw-r--r-- | arch/cris/kernel/irq.c | 5 |
5 files changed, 2 insertions, 19 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index 2b73c7a5b649..31ca1418d5a7 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c | |||
@@ -28,7 +28,6 @@ | |||
28 | 28 | ||
29 | extern void update_xtime_from_cmos(void); | 29 | extern void update_xtime_from_cmos(void); |
30 | extern int set_rtc_mmss(unsigned long nowtime); | 30 | extern int set_rtc_mmss(unsigned long nowtime); |
31 | extern int setup_irq(int, struct irqaction *); | ||
32 | extern int have_rtc; | 31 | extern int have_rtc; |
33 | 32 | ||
34 | unsigned long get_ns_in_jiffie(void) | 33 | unsigned long get_ns_in_jiffie(void) |
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index d2a3ff8c4d37..058adddf4e4b 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
@@ -52,8 +52,6 @@ static struct mm_struct* flush_mm; | |||
52 | static struct vm_area_struct* flush_vma; | 52 | static struct vm_area_struct* flush_vma; |
53 | static unsigned long flush_addr; | 53 | static unsigned long flush_addr; |
54 | 54 | ||
55 | extern int setup_irq(int, struct irqaction *); | ||
56 | |||
57 | /* Mode registers */ | 55 | /* Mode registers */ |
58 | static unsigned long irq_regs[NR_CPUS] = { | 56 | static unsigned long irq_regs[NR_CPUS] = { |
59 | regi_irq, | 57 | regi_irq, |
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index 65633d0dab86..b1920d8de403 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c | |||
@@ -46,7 +46,6 @@ unsigned long timer_regs[NR_CPUS] = | |||
46 | 46 | ||
47 | extern void update_xtime_from_cmos(void); | 47 | extern void update_xtime_from_cmos(void); |
48 | extern int set_rtc_mmss(unsigned long nowtime); | 48 | extern int set_rtc_mmss(unsigned long nowtime); |
49 | extern int setup_irq(int, struct irqaction *); | ||
50 | extern int have_rtc; | 49 | extern int have_rtc; |
51 | 50 | ||
52 | #ifdef CONFIG_CPU_FREQ | 51 | #ifdef CONFIG_CPU_FREQ |
diff --git a/arch/cris/include/asm/hardirq.h b/arch/cris/include/asm/hardirq.h index 74178adeb1cd..17bb12d760b2 100644 --- a/arch/cris/include/asm/hardirq.h +++ b/arch/cris/include/asm/hardirq.h | |||
@@ -2,16 +2,6 @@ | |||
2 | #define __ASM_HARDIRQ_H | 2 | #define __ASM_HARDIRQ_H |
3 | 3 | ||
4 | #include <asm/irq.h> | 4 | #include <asm/irq.h> |
5 | #include <linux/threads.h> | ||
6 | #include <linux/cache.h> | ||
7 | |||
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 | void ack_bad_irq(unsigned int irq); | ||
15 | 5 | ||
16 | #define HARDIRQ_BITS 8 | 6 | #define HARDIRQ_BITS 8 |
17 | 7 | ||
@@ -24,4 +14,6 @@ void ack_bad_irq(unsigned int irq); | |||
24 | # error HARDIRQ_BITS is too low! | 14 | # error HARDIRQ_BITS is too low! |
25 | #endif | 15 | #endif |
26 | 16 | ||
17 | #include <asm-generic/hardirq.h> | ||
18 | |||
27 | #endif /* __ASM_HARDIRQ_H */ | 19 | #endif /* __ASM_HARDIRQ_H */ |
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c index 7f642fcffbfc..0ca7d9892cc6 100644 --- a/arch/cris/kernel/irq.c +++ b/arch/cris/kernel/irq.c | |||
@@ -38,11 +38,6 @@ | |||
38 | 38 | ||
39 | #include <asm/io.h> | 39 | #include <asm/io.h> |
40 | 40 | ||
41 | void ack_bad_irq(unsigned int irq) | ||
42 | { | ||
43 | printk("unexpected IRQ trap at vector %02x\n", irq); | ||
44 | } | ||
45 | |||
46 | int show_interrupts(struct seq_file *p, void *v) | 41 | int show_interrupts(struct seq_file *p, void *v) |
47 | { | 42 | { |
48 | int i = *(loff_t *) v, j; | 43 | int i = *(loff_t *) v, j; |