From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 09:25:18 +0000 (+0100)
Subject: Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing... 
X-Git-Tag: v2.6.30-rc1~2^2~109
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1c511f740fe7031867f51831854360e8be1ba34c;p=~shefty%2Frdma-dev.git

Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core
---

1c511f740fe7031867f51831854360e8be1ba34c
diff --cc kernel/trace/trace_sysprof.c
index 4e2de4de1d6,84ca9d81e74,9902c15997a,eaca5ad803f..7c9a2d82a7d
--- a/kernel/trace/trace_sysprof.c
+++ b/kernel/trace/trace_sysprof.c
@@@@@ -238,10 -238,10 -238,12 -247,7 +238,12 @@@@@ static int stack_trace_init(struct trac
    {
    	sysprof_trace = tr;
    
   -	start_stack_trace(tr);
++ +	tracing_start_cmdline_record();
++ +
   +	mutex_lock(&sample_timer_lock);
   +	start_stack_timers();
   +	tracer_enabled = 1;
   +	mutex_unlock(&sample_timer_lock);
    	return 0;
    }