diff options
| author | Andrew Morton <akpm@osdl.org> | 2007-02-18 06:22:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 23:21:50 +0100 |
| commit | 6168a702ab0be181e5e57a0b2d0e7376f7a47f0b (patch) | |
| tree | 4eaecb660154bb36b3884b21bf335ff040559902 /init/main.c | |
| parent | [PATCH] fs/stack.c: Copy i_nlink after all other attributes are copied (diff) | |
| download | linux-6168a702ab0be181e5e57a0b2d0e7376f7a47f0b.tar.xz linux-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>
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index 953500b02ac4..1c5f6dce1bd2 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(); } |