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 <kjwinchester@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/init/main.c b/init/main.c
index dbee132..86cbfd0 100644 (file)
--- 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 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;
 {
        ktime_t calltime, delta, rettime;
        unsigned long long duration;


@@ -739,7 +739,7 @@ static int do_one_initcall_debug(initcall_t fn)
        return ret;
 }
 
        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;
 {
        int count = preempt_count();
        int ret;