Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master

PPC KVM fixes for 5.2

- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
  vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.

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;