From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 19 Feb 2009 09:20:17 +0000 (+0100)
Subject: Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40999096e8b9872199bf56ecd0c4d98397ccaf2f;p=linux-beck.git

Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing/core
---

40999096e8b9872199bf56ecd0c4d98397ccaf2f
diff --cc kernel/trace/trace_selftest.c
index 0c9aa1457e51,01415f4edaa5,bc8e80a86bca..7238646b8723
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@@@ -619,10 -619,10 -589,10 +638,10 @@@@ trace_selftest_startup_sysprof(struct t
   	int ret;
   
   	/* start the tracing */
  -	ret = trace->init(tr);
  +	ret = tracer_init(trace, tr);
   	if (ret) {
   		warn_failed_init_tracer(trace, ret);
- -		return 0;
+ +		return ret;
   	}
   
   	/* Sleep for a 1/10 of a second */