summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-25 11:23:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-25 11:23:43 -0700
commit7d63e6359a2e86cd6335337de99354ab07680c55 (patch)
tree8d33df8863b171a88508868c6670e0a553e44a30 /init/main.c
parent9f459fadbb38abe68aa342f533ca17d8d90d6f2e (diff)
parent4a683bf94b8a10e2bb0da07aec3ac0a55e5de61f (diff)
downloadlinux-stable-7d63e6359a2e86cd6335337de99354ab07680c55.tar.gz
linux-stable-7d63e6359a2e86cd6335337de99354ab07680c55.tar.bz2
linux-stable-7d63e6359a2e86cd6335337de99354ab07680c55.zip
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix too large stack usage in do_one_initcall() tracing: handle broken names in ftrace filter ftrace: Unify effect of writing to trace_options and option/*
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 2d9d6bdfe7c9..11f4f145be3f 100644
--- a/init/main.c
+++ b/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);