aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-02-18 00:22:39 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 17:21:50 -0500
commit6168a702ab0be181e5e57a0b2d0e7376f7a47f0b (patch)
tree4eaecb660154bb36b3884b21bf335ff040559902 /init/main.c
parenta6e6df25ec6751f4f73784398ab7d43cf9d2019f (diff)
[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.c5
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 @@
41#include <linux/cpuset.h> 41#include <linux/cpuset.h>
42#include <linux/efi.h> 42#include <linux/efi.h>
43#include <linux/tick.h> 43#include <linux/tick.h>
44#include <linux/interrupt.h>
44#include <linux/taskstats_kern.h> 45#include <linux/taskstats_kern.h>
45#include <linux/delayacct.h> 46#include <linux/delayacct.h>
46#include <linux/unistd.h> 47#include <linux/unistd.h>
@@ -702,11 +703,7 @@ static void __init do_basic_setup(void)
702 init_workqueues(); 703 init_workqueues();
703 usermodehelper_init(); 704 usermodehelper_init();
704 driver_init(); 705 driver_init();
705
706#ifdef CONFIG_PROC_FS
707 init_irq_proc(); 706 init_irq_proc();
708#endif
709
710 do_initcalls(); 707 do_initcalls();
711} 708}
712 709