path: root/init
diff options
authorKevin Winchester <>2010-08-09 17:20:32 -0700
committerLinus Torvalds <>2010-08-09 20:45:06 -0700
commite446127134de06c4aceaa511f411d06eac91634b (patch)
tree7e685b71d8ed98cf712e1a88111c4613bc6f1847 /init
parent22c5c03b42c082ab57b5d24824769ada0d90f8dc (diff)
init/main.c: mark do_one_initcall* as __init_or_module
Andrew Morton suggested that the do_one_initcall and do_one_initcall_debug functions can be marked __init_or_module such that they can be discarded for the CONFIG_MODULES=N case. Signed-off-by: Kevin Winchester <> Cc: Ingo Molnar <> Cc: Rusty Russell <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'init')
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index dbee132923c5..86cbfd085b01 100644
--- a/init/main.c
+++ b/init/main.c
@@ -721,7 +721,7 @@ core_param(initcall_debug, initcall_debug, bool, 0644);
static char msgbuf[64];
-static int do_one_initcall_debug(initcall_t fn)
+static int __init_or_module do_one_initcall_debug(initcall_t fn)
ktime_t calltime, delta, rettime;
unsigned long long duration;
@@ -739,7 +739,7 @@ static int do_one_initcall_debug(initcall_t fn)
return ret;
-int do_one_initcall(initcall_t fn)
+int __init_or_module do_one_initcall(initcall_t fn)
int count = preempt_count();
int ret;