diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-30 18:14:26 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-30 18:14:26 +0100 |
| commit | 1d5920c306f11db2c9e517f12843216b58c15046 (patch) | |
| tree | 167954031f8f30cd68e2afaeb92d353402c61050 /arch/powerpc/kvm/book3s_pr.c | |
| parent | 621ab20c06e0c0b45eb2382c048a0426bbff9b0e (diff) | |
| parent | fd24a8624eb29d3b6b7df68096ce0321b19b03c6 (diff) | |
| download | linux-1d5920c306f11db2c9e517f12843216b58c15046.tar.bz2 | |
Merge tag 'kvm-ppc-next-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
Second KVM PPC update for 5.6
* Fix compile warning on 32-bit machines
* Fix locking error in secure VM support
Diffstat (limited to 'arch/powerpc/kvm/book3s_pr.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_pr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c index d88f708d5be3..729a0f12a752 100644 --- a/arch/powerpc/kvm/book3s_pr.c +++ b/arch/powerpc/kvm/book3s_pr.c @@ -2017,6 +2017,7 @@ static int kvm_vm_ioctl_get_smmu_info_pr(struct kvm *kvm, { /* We should not get called */ BUG(); + return 0; } #endif /* CONFIG_PPC64 */ |