Skip to content

Commit

Permalink
init/main.c: mark do_one_initcall* as __init_or_module
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kevin Winchester authored and Linus Torvalds committed Aug 10, 2010
1 parent 22c5c03 commit e446127
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit e446127

Please sign in to comment.