Commit e4461271 authored Aug 09, 2010 by Kevin Winchester Committed by Linus Torvalds Aug 09, 2010

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>

parent 22c5c03b

init/main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;