aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>2008-07-25 19:45:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-26 12:00:04 -0700
commit7babe8db99d305340cf4828ce1f5a1481d5622ef (patch)
treefdac7a084646bb6d125ebc62b0b75806e45d1025 /init
parentc2147a5092cfe13dbf3210e54e8a622015edeecc (diff)
downloadmrst-s0i3-test-7babe8db99d305340cf4828ce1f5a1481d5622ef.tar.gz
mrst-s0i3-test-7babe8db99d305340cf4828ce1f5a1481d5622ef.tar.xz
mrst-s0i3-test-7babe8db99d305340cf4828ce1f5a1481d5622ef.zip
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')
-rw-r--r--init/main.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/init/main.c b/init/main.c
index b6fec08dbbe..20fdc9884b7 100644
--- a/init/main.c
+++ b/init/main.c
@@ -774,16 +774,7 @@ static void __init do_basic_setup(void)
do_initcalls();
}
-static int __initdata nosoftlockup;
-
-static int __init nosoftlockup_setup(char *str)
-{
- nosoftlockup = 1;
- return 1;
-}
-__setup("nosoftlockup", nosoftlockup_setup);
-
-static void __init __do_pre_smp_initcalls(void)
+static void __init do_pre_smp_initcalls(void)
{
initcall_t *call;
@@ -791,17 +782,6 @@ static void __init __do_pre_smp_initcalls(void)
do_one_initcall(*call);
}
-static void __init do_pre_smp_initcalls(void)
-{
- extern int spawn_ksoftirqd(void);
-
- init_call_single_data();
- migration_init();
- spawn_ksoftirqd();
- if (!nosoftlockup)
- spawn_softlockup_task();
-}
-
static void run_init_process(char *init_filename)
{
argv_init[0] = init_filename;
@@ -873,7 +853,6 @@ static int __init kernel_init(void * unused)
smp_prepare_cpus(setup_max_cpus);
- __do_pre_smp_initcalls();
do_pre_smp_initcalls();
smp_init();