aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorEduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>2008-07-25 22:45:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 15:00:04 -0400
commit7babe8db99d305340cf4828ce1f5a1481d5622ef (patch)
treefdac7a084646bb6d125ebc62b0b75806e45d1025 /init/main.c
parentc2147a5092cfe13dbf3210e54e8a622015edeecc (diff)
Full conversion to early_initcall() interface, remove old interface
A previous patch added the early_initcall(), to allow a cleaner hooking of pre-SMP initcalls. Now we remove the older interface, converting all existing users to the new one. [akpm@linux-foundation.org: cleanups] [akpm@linux-foundation.org: build fix] [kosaki.motohiro@jp.fujitsu.com: warning fix] [kosaki.motohiro@jp.fujitsu.com: warning fix] Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> Cc: Tom Zanussi <tzanussi@gmail.com> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/init/main.c b/init/main.c
index b6fec08dbbef..20fdc9884b77 100644
--- a/init/main.c
+++ b/init/main.c
@@ -774,16 +774,7 @@ static void __init do_basic_setup(void)
774 do_initcalls(); 774 do_initcalls();
775} 775}
776 776
777static int __initdata nosoftlockup; 777static void __init do_pre_smp_initcalls(void)
778
779static int __init nosoftlockup_setup(char *str)
780{
781 nosoftlockup = 1;
782 return 1;
783}
784__setup("nosoftlockup", nosoftlockup_setup);
785
786static void __init __do_pre_smp_initcalls(void)
787{ 778{
788 initcall_t *call; 779 initcall_t *call;
789 780
@@ -791,17 +782,6 @@ static void __init __do_pre_smp_initcalls(void)
791 do_one_initcall(*call); 782 do_one_initcall(*call);
792} 783}
793 784
794static void __init do_pre_smp_initcalls(void)
795{
796 extern int spawn_ksoftirqd(void);
797
798 init_call_single_data();
799 migration_init();
800 spawn_ksoftirqd();
801 if (!nosoftlockup)
802 spawn_softlockup_task();
803}
804
805static void run_init_process(char *init_filename) 785static void run_init_process(char *init_filename)
806{ 786{
807 argv_init[0] = init_filename; 787 argv_init[0] = init_filename;
@@ -873,7 +853,6 @@ static int __init kernel_init(void * unused)
873 853
874 smp_prepare_cpus(setup_max_cpus); 854 smp_prepare_cpus(setup_max_cpus);
875 855
876 __do_pre_smp_initcalls();
877 do_pre_smp_initcalls(); 856 do_pre_smp_initcalls();
878 857
879 smp_init(); 858 smp_init();