diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:21:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:21:49 +0100 |
| commit | 53664738c122bfe8b0e489fddaf2ab265c9133c8 (patch) | |
| tree | 8121a9fc4021e86499c404e0b1012a36e8d0b00e /kernel/trace/blktrace.c | |
| parent | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (diff) | |
| parent | e9d25fe6eaa2c720bb3ea661b660e58d54fa38bf (diff) | |
| download | kernel-crypto-53664738c122bfe8b0e489fddaf2ab265c9133c8.tar.gz kernel-crypto-53664738c122bfe8b0e489fddaf2ab265c9133c8.tar.xz kernel-crypto-53664738c122bfe8b0e489fddaf2ab265c9133c8.zip | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/blktrace.c')
| -rw-r--r-- | kernel/trace/blktrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index e82cb9e930c..e39679a72a3 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1231,7 +1231,6 @@ static struct tracer blk_tracer __read_mostly = { static struct trace_event trace_blk_event = { .type = TRACE_BLK, .trace = blk_trace_event_print, - .latency_trace = blk_trace_event_print, .binary = blk_trace_event_print_binary, }; |