diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
| commit | 24e8a2ca1f74574ad2ed1ac7af0260dd90fd911e (patch) | |
| tree | c863dd43c84579d853f3a2ae0ee6ead46c967703 /net/ipv4/raw.c | |
| parent | 66f61c92889ff3ca365161fb29dd36d6354682ba (diff) | |
| parent | d724c9e54939a597592de3659541da11fc7aa112 (diff) | |
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.
Diffstat (limited to 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index dc91c27bb788..0e482f07b37f 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -1076,7 +1076,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i) | |||
| 1076 | srcp = inet->inet_num; | 1076 | srcp = inet->inet_num; |
| 1077 | 1077 | ||
| 1078 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" | 1078 | seq_printf(seq, "%4d: %08X:%04X %08X:%04X" |
| 1079 | " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d\n", | 1079 | " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %u\n", |
| 1080 | i, src, srcp, dest, destp, sp->sk_state, | 1080 | i, src, srcp, dest, destp, sp->sk_state, |
| 1081 | sk_wmem_alloc_get(sp), | 1081 | sk_wmem_alloc_get(sp), |
| 1082 | sk_rmem_alloc_get(sp), | 1082 | sk_rmem_alloc_get(sp), |
