diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 14:23:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 14:23:43 -0400 |
commit | 7d63e6359a2e86cd6335337de99354ab07680c55 (patch) | |
tree | 8d33df8863b171a88508868c6670e0a553e44a30 /init | |
parent | 9f459fadbb38abe68aa342f533ca17d8d90d6f2e (diff) | |
parent | 4a683bf94b8a10e2bb0da07aec3ac0a55e5de61f (diff) |
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')
-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 2d9d6bdfe7c9..11f4f145be3f 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -733,13 +733,14 @@ static void __init do_ctors(void) | |||
733 | int initcall_debug; | 733 | int initcall_debug; |
734 | core_param(initcall_debug, initcall_debug, bool, 0644); | 734 | core_param(initcall_debug, initcall_debug, bool, 0644); |
735 | 735 | ||
736 | static char msgbuf[64]; | ||
737 | static struct boot_trace_call call; | ||
738 | static struct boot_trace_ret ret; | ||
739 | |||
736 | int do_one_initcall(initcall_t fn) | 740 | int do_one_initcall(initcall_t fn) |
737 | { | 741 | { |
738 | int count = preempt_count(); | 742 | int count = preempt_count(); |
739 | ktime_t calltime, delta, rettime; | 743 | ktime_t calltime, delta, rettime; |
740 | char msgbuf[64]; | ||
741 | struct boot_trace_call call; | ||
742 | struct boot_trace_ret ret; | ||
743 | 744 | ||
744 | if (initcall_debug) { | 745 | if (initcall_debug) { |
745 | call.caller = task_pid_nr(current); | 746 | call.caller = task_pid_nr(current); |