diff options
author | Andrew Morton <akpm@osdl.org> | 2007-02-17 21:22:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 14:21:50 -0800 |
commit | 6168a702ab0be181e5e57a0b2d0e7376f7a47f0b (patch) | |
tree | 4eaecb660154bb36b3884b21bf335ff040559902 | |
parent | a6e6df25ec6751f4f73784398ab7d43cf9d2019f (diff) | |
download | linux-3.10-6168a702ab0be181e5e57a0b2d0e7376f7a47f0b.tar.gz linux-3.10-6168a702ab0be181e5e57a0b2d0e7376f7a47f0b.tar.bz2 linux-3.10-6168a702ab0be181e5e57a0b2d0e7376f7a47f0b.zip |
[PATCH] Declare init_irq_proc before we use it.
powerpc gets:
init/main.c: In function `do_basic_setup':
init/main.c:714: warning: implicit declaration of function `init_irq_proc'
but we cannot include linux/irq.h in generic code.
Fix it by moving the declaration into linux/interrupt.h instead.
And make sure all code that defines init_irq_proc() is including
linux/interrupt.h.
And nuke an ifdef-in-C
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/h8300/kernel/ints.c | 1 | ||||
-rw-r--r-- | arch/h8300/platform/h8s/ints.c | 1 | ||||
-rw-r--r-- | arch/m68k/kernel/ints.c | 1 | ||||
-rw-r--r-- | arch/m68knommu/platform/5307/ints.c | 1 | ||||
-rw-r--r-- | include/linux/interrupt.h | 9 | ||||
-rw-r--r-- | include/linux/irq.h | 3 | ||||
-rw-r--r-- | init/main.c | 5 |
7 files changed, 14 insertions, 7 deletions
diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c index 587ef7f4fcc..3e4f479271c 100644 --- a/arch/h8300/kernel/ints.c +++ b/arch/h8300/kernel/ints.c @@ -19,6 +19,7 @@ #include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/seq_file.h> +#include <linux/interrupt.h> #include <linux/init.h> #include <linux/random.h> #include <linux/bootmem.h> diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c index 567f681ddfe..a71d6e2a391 100644 --- a/arch/h8300/platform/h8s/ints.c +++ b/arch/h8300/platform/h8s/ints.c @@ -20,6 +20,7 @@ #include <linux/kernel_stat.h> #include <linux/seq_file.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/bootmem.h> #include <linux/random.h> #include <linux/hardirq.h> diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 84aceca6c05..b66c97c904b 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c @@ -28,6 +28,7 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/sched.h> +#include <linux/interrupt.h> #include <linux/kernel_stat.h> #include <linux/errno.h> #include <linux/init.h> diff --git a/arch/m68knommu/platform/5307/ints.c b/arch/m68knommu/platform/5307/ints.c index a57239ec6c8..20f12a19a52 100644 --- a/arch/m68knommu/platform/5307/ints.c +++ b/arch/m68knommu/platform/5307/ints.c @@ -19,6 +19,7 @@ #include <linux/types.h> #include <linux/init.h> #include <linux/sched.h> +#include <linux/interrupt.h> #include <linux/kernel_stat.h> #include <linux/errno.h> #include <linux/seq_file.h> diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index e5ea1411050..838cf5a5bd7 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -423,4 +423,13 @@ extern int probe_irq_off(unsigned long); /* returns 0 or negative on failure */ extern unsigned int probe_irq_mask(unsigned long); /* returns mask of ISA interrupts */ #endif +#ifdef CONFIG_PROC_FS +/* Initialize /proc/irq/ */ +extern void init_irq_proc(void); +#else +static inline void init_irq_proc(void) +{ +} +#endif + #endif diff --git a/include/linux/irq.h b/include/linux/irq.h index 1939d42c21d..aa5b3e6178a 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -328,9 +328,6 @@ extern void note_interrupt(unsigned int irq, struct irq_desc *desc, /* Resending of interrupts :*/ void check_irq_resend(struct irq_desc *desc, unsigned int irq); -/* Initialize /proc/irq/ */ -extern void init_irq_proc(void); - /* Enable/disable irq debugging output: */ extern int noirqdebug_setup(char *str); diff --git a/init/main.c b/init/main.c index 953500b02ac..1c5f6dce1bd 100644 --- a/init/main.c +++ b/init/main.c @@ -41,6 +41,7 @@ #include <linux/cpuset.h> #include <linux/efi.h> #include <linux/tick.h> +#include <linux/interrupt.h> #include <linux/taskstats_kern.h> #include <linux/delayacct.h> #include <linux/unistd.h> @@ -702,11 +703,7 @@ static void __init do_basic_setup(void) init_workqueues(); usermodehelper_init(); driver_init(); - -#ifdef CONFIG_PROC_FS init_irq_proc(); -#endif - do_initcalls(); } |