diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-19 12:37:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-19 12:37:22 +0100 |
| commit | 8fd8f8d65bf56aaa80c7ae5eaf26afd586139683 (patch) | |
| tree | 8f9fd52a208936407fcba87b85c4445b38ee5eaa /kernel/trace/trace_kdb.c | |
| parent | bf72d1505bc41ffd6b8d052e6da2f8fc535ed45a (diff) | |
| parent | 58b454ebf81e5ae9391957d99cf89566d9eec1b1 (diff) | |
Merge tag 'v4.14.112' into linux-linaro-lsk-v4.14linux-linaro-lsk-v4.14
This is the 4.14.112 stable release
Diffstat (limited to 'kernel/trace/trace_kdb.c')
| -rw-r--r-- | kernel/trace/trace_kdb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c index d953c163a079..810d78a8d14c 100644 --- a/kernel/trace/trace_kdb.c +++ b/kernel/trace/trace_kdb.c @@ -51,14 +51,16 @@ static void ftrace_dump_buf(int skip_lines, long cpu_file) if (cpu_file == RING_BUFFER_ALL_CPUS) { for_each_tracing_cpu(cpu) { iter.buffer_iter[cpu] = - ring_buffer_read_prepare(iter.trace_buffer->buffer, cpu); + ring_buffer_read_prepare(iter.trace_buffer->buffer, + cpu, GFP_ATOMIC); ring_buffer_read_start(iter.buffer_iter[cpu]); tracing_iter_reset(&iter, cpu); } } else { iter.cpu_file = cpu_file; iter.buffer_iter[cpu_file] = - ring_buffer_read_prepare(iter.trace_buffer->buffer, cpu_file); + ring_buffer_read_prepare(iter.trace_buffer->buffer, + cpu_file, GFP_ATOMIC); ring_buffer_read_start(iter.buffer_iter[cpu_file]); tracing_iter_reset(&iter, cpu_file); } |