diff --git a/[refs] b/[refs] index bf32090bb01f..d9fb4493634c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eda1e328556565e211b7450250e40d6de751563a +refs/heads/master: 4a683bf94b8a10e2bb0da07aec3ac0a55e5de61f diff --git a/trunk/init/main.c b/trunk/init/main.c index 2c5ade79eb81..98e679e3494a 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -733,13 +733,14 @@ static void __init do_ctors(void) int initcall_debug; core_param(initcall_debug, initcall_debug, bool, 0644); +static char msgbuf[64]; +static struct boot_trace_call call; +static struct boot_trace_ret ret; + int do_one_initcall(initcall_t fn) { int count = preempt_count(); ktime_t calltime, delta, rettime; - char msgbuf[64]; - struct boot_trace_call call; - struct boot_trace_ret ret; if (initcall_debug) { call.caller = task_pid_nr(current);