From: Kevin Winchester <kjwinchester@gmail.com>
Date: Tue, 10 Aug 2010 00:20:32 +0000 (-0700)
Subject: init/main.c: mark do_one_initcall* as __init_or_module
X-Git-Tag: firefly_0821_release~9833^2~1101
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e446127134de06c4aceaa511f411d06eac91634b;p=firefly-linux-kernel-4.4.55.git

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 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;