summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAndrey Smetanin <asmetanin@virtuozzo.com>2015-12-28 16:27:18 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2016-01-08 19:04:39 +0100
commit1ac1b65ac199205724a8077d37ba7e64a1b7e77c (patch)
treee9a0ed01fc79ef73d5644d41edc609c5afe01502 /arch/x86
parentKVM: move architecture-dependent requests to arch/ (diff)
downloadlinux-1ac1b65ac199205724a8077d37ba7e64a1b7e77c.tar.xz
linux-1ac1b65ac199205724a8077d37ba7e64a1b7e77c.zip
kvm/x86: Hyper-V timers fix incorrect logical operation
Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com> Reviewed-by: Roman Kagan <rkagan@virtuozzo.com> CC: Gleb Natapov <gleb@kernel.org> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Roman Kagan <rkagan@virtuozzo.com> CC: Denis V. Lunev <den@openvz.org> CC: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/hyperv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index f34f666778b2..e4ef13a37d4c 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -583,7 +583,7 @@ static void stimer_expiration(struct kvm_vcpu_hv_stimer *stimer)
{
stimer_send_msg(stimer);
if (!(stimer->config & HV_STIMER_PERIODIC))
- stimer->config |= ~HV_STIMER_ENABLE;
+ stimer->config &= ~HV_STIMER_ENABLE;
else
stimer_restart(stimer);
}