Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* '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/*

diff --combined init/main.c
index 2d9d6bd,98e679e..11f4f14
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -584,8 -584,8 +584,8 @@@ asmlinkage void __init start_kernel(voi
        setup_arch(&command_line);
        mm_init_owner(&init_mm, &init_task);
        setup_command_line(command_line);
 -      setup_per_cpu_areas();
        setup_nr_cpu_ids();
 +      setup_per_cpu_areas();
        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
  
        build_all_zonelists();
@@@ -733,13 -733,14 +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);