4 Commits

Author	SHA1	Message	Date
Ingo Molnar	f0ef039851	Merge branch 'x86/core' into tracing/textedit ... Conflicts: arch/x86/Kconfig block/blktrace.c kernel/irq/handle.c Semantic conflict: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>	2009-03-06 16:45:01 +01:00
Steven Rostedt	5fd73f8624	tracing: remove extra latency_trace method from trace structure ... Impact: clean up The trace and latency_trace function pointers are identical for every tracer but the function tracer. The differences in the function tracer are trivial (latency output puts paranthesis around parent). This patch removes the latency_trace pointer and all prints will now just use the trace output function pointer. Signed-off-by: Steven Rostedt <srostedt@redhat.com>	2009-03-04 21:42:04 -05:00
Ingo Molnar	72c26c9a26	Merge branch 'linus' into tracing/blktrace ... Conflicts: block/blktrace.c Semantic merge: kernel/trace/blktrace.c Signed-off-by: Ingo Molnar <mingo@elte.hu>	2009-02-19 09:00:35 +01:00
Frederic Weisbecker	2db270a80b	tracing/blktrace: move the tracing file to kernel/trace ... Impact: cleanup Move blktrace.c to kernel/trace, also move its config entry. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>	2009-02-09 10:51:02 +01:00