summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-26 09:38:14 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-26 09:38:14 +0200
commitd763572ce4307b7d45faf51c020150aa3e918855 (patch)
tree94c93ebed4a4c460dae39d40810ee1492bfdc66c /init
parentcb188884cbddfc32f142c66f54465bd4ed786fe4 (diff)
parent9e6d9c5e5889ce8fde5afc5066c5825a3d52114d (diff)
downloadlwn-d763572ce4307b7d45faf51c020150aa3e918855.tar.gz
lwn-d763572ce4307b7d45faf51c020150aa3e918855.zip
Merge branch 'rt/base' into rt/head
Diffstat (limited to 'init')
-rw-r--r--init/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 3c656bae4da2..6ddf35d55822 100644
--- a/init/main.c
+++ b/init/main.c
@@ -738,13 +738,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);