diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-09-29 16:19:29 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-09-29 16:19:29 +0200 |
| commit | 40a6d2208481b1d57c80b33110dbf78f271be5a6 (patch) | |
| tree | 0ff66109e16049c1b328bcae31995750085a3cda /arch/powerpc/kvm/booke.c | |
| parent | 45ca877ad0519a02c22aaff2e2cdf333a1421a0a (diff) | |
| parent | fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e (diff) | |
| download | linux-40a6d2208481b1d57c80b33110dbf78f271be5a6.tar.gz linux-40a6d2208481b1d57c80b33110dbf78f271be5a6.tar.xz | |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into next
PPC KVM updates for 4.9.
- Fix for the bug that Thomas Huth found which caused guests to falsely
report soft lockups,
- other minor fixes from Thomas Huth and Dan Carpenter,
- and a small optimization from Balbir Singh.
Diffstat (limited to 'arch/powerpc/kvm/booke.c')
| -rw-r--r-- | arch/powerpc/kvm/booke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 02b4672f7347..df3f2706d3e5 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -2038,7 +2038,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, if (type == KVMPPC_DEBUG_NONE) continue; - if (type & !(KVMPPC_DEBUG_WATCH_READ | + if (type & ~(KVMPPC_DEBUG_WATCH_READ | KVMPPC_DEBUG_WATCH_WRITE | KVMPPC_DEBUG_BREAKPOINT)) return -EINVAL; |