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

[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

init/main.c

+3 −0
Original line number Diff line number Diff line
@@ -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();

}

kernel/sysctl.c

+0 −3
Original line number Diff line number Diff line
@@ -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

}