[PATCH] sysctl: move init_irq_proc into init/main where it belongs
Eric W. Biederman [Wed, 14 Feb 2007 08:33:57 +0000 (00:33 -0800)]
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

init/main.c
kernel/sysctl.c

index 4e9e92b..a20a513 100644 (file)
@@ -705,6 +705,9 @@ static void __init do_basic_setup(void)
 #ifdef CONFIG_SYSCTL
        sysctl_init();
 #endif
+#ifdef CONFIG_PROC_FS
+       init_irq_proc();
+#endif
 
        do_initcalls();
 }
index e0ac6cd..7ba4b0c 100644 (file)
@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = {
        { .ctl_name = 0 }
 };
 
-extern void init_irq_proc (void);
-
 static DEFINE_SPINLOCK(sysctl_lock);
 
 /* called under sysctl_lock */
@@ -1224,7 +1222,6 @@ void __init sysctl_init(void)
 {
 #ifdef CONFIG_PROC_SYSCTL
        register_proc_table(root_table, proc_sys_root, &root_table_header);
-       init_irq_proc();
 #endif
 }