diff options
| author | Linus Torvalds | 2019-05-26 22:49:40 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-05-26 22:49:40 +0200 |
| commit | c5b440951a19fdd068090d38dcbe72ea28e5e0d0 (patch) | |
| tree | 4078aba02a1cac17bdc9fb84238c4f2207187863 /kernel/trace/trace.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | tracing: Silence GCC 9 array bounds warning (diff) | |
| download | kernel-qcow2-linux-c5b440951a19fdd068090d38dcbe72ea28e5e0d0.tar.gz kernel-qcow2-linux-c5b440951a19fdd068090d38dcbe72ea28e5e0d0.tar.xz kernel-qcow2-linux-c5b440951a19fdd068090d38dcbe72ea28e5e0d0.zip | |
Merge tag 'trace-v5.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing warning fix from Steven Rostedt:
"Make the GCC 9 warning for sub struct memset go away.
GCC 9 now warns about calling memset() on partial structures when it
goes across multiple fields. This adds a helper for the place in
tracing that does this type of clearing of a structure"
* tag 'trace-v5.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Silence GCC 9 array bounds warning
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2c92b3d9ea30..1c80521fd436 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8910,12 +8910,8 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) cnt++; - /* reset all but tr, trace, and overruns */ - memset(&iter.seq, 0, - sizeof(struct trace_iterator) - - offsetof(struct trace_iterator, seq)); + trace_iterator_reset(&iter); iter.iter_flags |= TRACE_FILE_LAT_FMT; - iter.pos = -1; if (trace_find_next_entry_inc(&iter) != NULL) { int ret; |