2008-02-22 20:00:21

by Adrian Bunk

Subject: [2.6 patch] proper __do_softirq() prototype

This patch adds a proper prototype for __do_softirq() in
include/linux/interrupt.h

Signed-off-by: Adrian Bunk <[email protected]>

---

arch/s390/kernel/irq.c | 2 --
arch/sh/kernel/irq.c | 2 --
arch/x86/kernel/irq_32.c | 2 --
include/asm-powerpc/irq.h | 2 --
include/linux/interrupt.h | 1 +
5 files changed, 1 insertion(+), 8 deletions(-)

746ab96445cd401fa4cfed6704628ea6efe75d63 diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c36d812..c59a86d 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -60,8 +60,6 @@ init_IRQ(void)
/*
* Switch to the asynchronous interrupt stack for softirq execution.
*/
-extern void __do_softirq(void);
-
asmlinkage void do_softirq(void)
{
unsigned long flags, old, new;
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 9bf19b0..a2a99e4 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -200,8 +200,6 @@ void irq_ctx_exit(int cpu)
hardirq_ctx[cpu] = NULL;
}

-extern asmlinkage void __do_softirq(void);
-
asmlinkage void do_softirq(void)
{
unsigned long flags;
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index cef054b..2af12b3 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)
hardirq_ctx[cpu] = NULL;
}

-extern asmlinkage void __do_softirq(void);
-
asmlinkage void do_softirq(void)
{
unsigned long flags;
diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
index b5c0312..5089deb 100644
--- a/include/asm-powerpc/irq.h
+++ b/include/asm-powerpc/irq.h
@@ -619,8 +619,6 @@ struct pt_regs;

#define __ARCH_HAS_DO_SOFTIRQ

-extern void __do_softirq(void);
-
#ifdef CONFIG_IRQSTACKS
/*
* Per-cpu stacks for handling hard and soft interrupts.
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index f8ab4ce..8ccc912 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -270,6 +270,7 @@ struct softirq_action
};

asmlinkage void do_softirq(void);
+asmlinkage void __do_softirq(void);
extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *data);
extern void softirq_init(void);
#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)

2008-02-23 10:25:08

by Ingo Molnar

Subject: Re: [2.6 patch] proper __do_softirq() prototype

* Adrian Bunk <[email protected]> wrote:

> This patch adds a proper prototype for __do_softirq() in
> include/linux/interrupt.h

Acked-by: Ingo Molnar <[email protected]>

Ingo