[PATCH] sysctl: move init_irq_proc into init/main where it belongs
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>
This commit is contained in:
parent
0e03036c97
commit
b04c3afb2b
2 changed files with 3 additions and 3 deletions
|
@ -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[] = {
|
||||||
{ .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)
|
||||||
{
|
{
|
||||||
#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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue