Commit b04c3afb authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

[PATCH] sysctl: move init_irq_proc into init/main where it belongs

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0e03036c
...@@ -705,6 +705,9 @@ static void __init do_basic_setup(void) ...@@ -705,6 +705,9 @@ static void __init do_basic_setup(void)
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
sysctl_init(); sysctl_init();
#endif #endif
#ifdef CONFIG_PROC_FS
init_irq_proc();
#endif
do_initcalls(); do_initcalls();
} }
......
...@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = { ...@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = {
{ .ctl_name = 0 } { .ctl_name = 0 }
}; };
extern void init_irq_proc (void);
static DEFINE_SPINLOCK(sysctl_lock); static DEFINE_SPINLOCK(sysctl_lock);
/* called under sysctl_lock */ /* called under sysctl_lock */
...@@ -1224,7 +1222,6 @@ void __init sysctl_init(void) ...@@ -1224,7 +1222,6 @@ void __init sysctl_init(void)
{ {
#ifdef CONFIG_PROC_SYSCTL #ifdef CONFIG_PROC_SYSCTL
register_proc_table(root_table, proc_sys_root, &root_table_header); register_proc_table(root_table, proc_sys_root, &root_table_header);
init_irq_proc();
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment