diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 10:23:16 +0200 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /kernel/trace/trace_output.c | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 54373d93e251..ba751f993c3b 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1057,7 +1057,7 @@ static enum print_line_t trace_stack_print(struct trace_iterator *iter, trace_seq_puts(s, "<stack trace>\n"); - for (p = field->caller; p && *p != ULONG_MAX && p < end; p++) { + for (p = field->caller; p && p < end && *p != ULONG_MAX; p++) { if (trace_seq_has_overflowed(s)) break; |