diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-26 09:37:54 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-26 09:37:54 +0200 |
commit | 9e6d9c5e5889ce8fde5afc5066c5825a3d52114d (patch) | |
tree | 5f145236afb7d7cb65efd7ed267ef131e7a05bda /init | |
parent | 89236ce246166dc6fceef1164bd19cfc13b477a0 (diff) | |
parent | 0a47df7bd2e94290b19870cd71909d3f24a9e959 (diff) | |
download | lwn-9e6d9c5e5889ce8fde5afc5066c5825a3d52114d.tar.gz lwn-9e6d9c5e5889ce8fde5afc5066c5825a3d52114d.zip |
Merge branch 'rt/atomic-locks' into rt/base
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index a6075cbb4be0..43236fddb537 100644 --- a/init/main.c +++ b/init/main.c @@ -732,13 +732,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); |