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, 2 insertions, 2 deletions

diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c
index 58a2cd002a4b..7317438ecd9e 100644
--- a/tools/bpf/bpftool/btf.c
+++ b/tools/bpf/bpftool/btf.c
@@ -208,8 +208,8 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
                 break;
         }
         case BTF_KIND_FWD: {
-                const char *fwd_kind = BTF_INFO_KIND(t->info) ? "union"
-                                                              : "struct";
+                const char *fwd_kind = BTF_INFO_KFLAG(t->info) ? "union"
+                                                               : "struct";
 
                 if (json_output)
                         jsonw_string_field(w, "fwd_kind", fwd_kind);