aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
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
commitc2147a5092cfe13dbf3210e54e8a622015edeecc (patch)
treee34e0daee3cc0b19914a27d6f7f284b1fc22aa93 /init/main.c
parent89081d17f7bb81d89fa1aa9b70f821c5cf4d39e9 (diff)
downloadmrst-s0i3-test-c2147a5092cfe13dbf3210e54e8a622015edeecc.tar.gz
mrst-s0i3-test-c2147a5092cfe13dbf3210e54e8a622015edeecc.tar.xz
mrst-s0i3-test-c2147a5092cfe13dbf3210e54e8a622015edeecc.zip
Better interface for hooking early initcalls
Added early initcall (pre-SMP) support, using an identical interface to that of regular initcalls. Functions called from do_pre_smp_initcalls() could be converted to use this cleaner interface. This is required by CPU hotplug, because early users have to register notifiers before going SMP. One such CPU hotplug user is the relay interface with buffer-only channels, which needs to register such a notifier, to be usable in early code. This in turn is used by kmemtrace. Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> Cc: Tom Zanussi <tzanussi@gmail.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.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index 0604cbcaf1e..b6fec08dbbe 100644
--- a/init/main.c
+++ b/init/main.c
@@ -743,13 +743,13 @@ static void __init do_one_initcall(initcall_t fn)
}
-extern initcall_t __initcall_start[], __initcall_end[];
+extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
static void __init do_initcalls(void)
{
initcall_t *call;
- for (call = __initcall_start; call < __initcall_end; call++)
+ for (call = __early_initcall_end; call < __initcall_end; call++)
do_one_initcall(*call);
/* Make sure there is no pending stuff from the initcall sequence */
@@ -783,6 +783,14 @@ static int __init nosoftlockup_setup(char *str)
}
__setup("nosoftlockup", nosoftlockup_setup);
+static void __init __do_pre_smp_initcalls(void)
+{
+ initcall_t *call;
+
+ for (call = __initcall_start; call < __early_initcall_end; call++)
+ do_one_initcall(*call);
+}
+
static void __init do_pre_smp_initcalls(void)
{
extern int spawn_ksoftirqd(void);
@@ -865,6 +873,7 @@ static int __init kernel_init(void * unused)
smp_prepare_cpus(setup_max_cpus);
+ __do_pre_smp_initcalls();
do_pre_smp_initcalls();
smp_init();