diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-04-29 03:59:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:02 -0400 |
commit | eb0f1c442d7cf1f7cb746c26c6120bb42e69c49c (patch) | |
tree | 75b6b2f9bdefe846523b71d812aea14aa352150b | |
parent | 8d4b69002e56e93f1cfe8bb863846ecde3990032 (diff) |
proper __do_softirq() prototype
Add a proper prototype for __do_softirq() in include/linux/interrupt.h
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/s390/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/irq_32.c | 2 | ||||
-rw-r--r-- | include/asm-powerpc/irq.h | 2 | ||||
-rw-r--r-- | include/linux/interrupt.h | 1 |
5 files changed, 1 insertions, 8 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index c36d8123ca14..c59a86dca584 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -60,8 +60,6 @@ init_IRQ(void) | |||
60 | /* | 60 | /* |
61 | * Switch to the asynchronous interrupt stack for softirq execution. | 61 | * Switch to the asynchronous interrupt stack for softirq execution. |
62 | */ | 62 | */ |
63 | extern void __do_softirq(void); | ||
64 | |||
65 | asmlinkage void do_softirq(void) | 63 | asmlinkage void do_softirq(void) |
66 | { | 64 | { |
67 | unsigned long flags, old, new; | 65 | unsigned long flags, old, new; |
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 9bf19b00696a..a2a99e487e33 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
@@ -200,8 +200,6 @@ void irq_ctx_exit(int cpu) | |||
200 | hardirq_ctx[cpu] = NULL; | 200 | hardirq_ctx[cpu] = NULL; |
201 | } | 201 | } |
202 | 202 | ||
203 | extern asmlinkage void __do_softirq(void); | ||
204 | |||
205 | asmlinkage void do_softirq(void) | 203 | asmlinkage void do_softirq(void) |
206 | { | 204 | { |
207 | unsigned long flags; | 205 | unsigned long flags; |
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 00bda7bcda63..147352df28b9 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
@@ -190,8 +190,6 @@ void irq_ctx_exit(int cpu) | |||
190 | hardirq_ctx[cpu] = NULL; | 190 | hardirq_ctx[cpu] = NULL; |
191 | } | 191 | } |
192 | 192 | ||
193 | extern asmlinkage void __do_softirq(void); | ||
194 | |||
195 | asmlinkage void do_softirq(void) | 193 | asmlinkage void do_softirq(void) |
196 | { | 194 | { |
197 | unsigned long flags; | 195 | unsigned long flags; |
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h index b5c03127a9b9..5089deb8fec3 100644 --- a/include/asm-powerpc/irq.h +++ b/include/asm-powerpc/irq.h | |||
@@ -619,8 +619,6 @@ struct pt_regs; | |||
619 | 619 | ||
620 | #define __ARCH_HAS_DO_SOFTIRQ | 620 | #define __ARCH_HAS_DO_SOFTIRQ |
621 | 621 | ||
622 | extern void __do_softirq(void); | ||
623 | |||
624 | #ifdef CONFIG_IRQSTACKS | 622 | #ifdef CONFIG_IRQSTACKS |
625 | /* | 623 | /* |
626 | * Per-cpu stacks for handling hard and soft interrupts. | 624 | * Per-cpu stacks for handling hard and soft interrupts. |
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index b5fef13148bd..f1fc7470d26c 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -289,6 +289,7 @@ struct softirq_action | |||
289 | }; | 289 | }; |
290 | 290 | ||
291 | asmlinkage void do_softirq(void); | 291 | asmlinkage void do_softirq(void); |
292 | asmlinkage void __do_softirq(void); | ||
292 | extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *data); | 293 | extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *data); |
293 | extern void softirq_init(void); | 294 | extern void softirq_init(void); |
294 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) | 295 | #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) |