diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8bc8d8afea6a..da984ad065ab 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -3085,7 +3085,8 @@ tracing_fill_pipe_page(size_t rem, struct trace_iterator *iter) | |||
| 3085 | break; | 3085 | break; |
| 3086 | } | 3086 | } |
| 3087 | 3087 | ||
| 3088 | trace_consume(iter); | 3088 | if (ret != TRACE_TYPE_NO_CONSUME) |
| 3089 | trace_consume(iter); | ||
| 3089 | rem -= count; | 3090 | rem -= count; |
| 3090 | if (!find_next_entry_inc(iter)) { | 3091 | if (!find_next_entry_inc(iter)) { |
| 3091 | rem = 0; | 3092 | rem = 0; |
| @@ -4233,8 +4234,11 @@ static void __ftrace_dump(bool disable_tracing) | |||
| 4233 | iter.pos = -1; | 4234 | iter.pos = -1; |
| 4234 | 4235 | ||
| 4235 | if (find_next_entry_inc(&iter) != NULL) { | 4236 | if (find_next_entry_inc(&iter) != NULL) { |
| 4236 | print_trace_line(&iter); | 4237 | int ret; |
| 4237 | trace_consume(&iter); | 4238 | |
| 4239 | ret = print_trace_line(&iter); | ||
| 4240 | if (ret != TRACE_TYPE_NO_CONSUME) | ||
| 4241 | trace_consume(&iter); | ||
| 4238 | } | 4242 | } |
| 4239 | 4243 | ||
| 4240 | trace_printk_seq(&iter.seq); | 4244 | trace_printk_seq(&iter.seq); |