The commit is pushed to "branch-rh7-3.10.0-327.4.5.vz7.11.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.4.5.vz7.11.2
------>
commit 71896959fbd0ae9f25d0e0dbc587491e1f5751f7
Author: Andrey Smetanin <asmeta...@virtuozzo.com>
Date: Tue Feb 16 13:50:24 2016 +0400
ms/kvm/x86: Hyper-V timers fix incorrect logical operation
ms commit - 1ac1b65ac199205724a8077d37ba7e64a1b7e77c.
Signed-off-by: Andrey Smetanin <asmeta...@virtuozzo.com>
Reviewed-by: Roman Kagan <rka...@virtuozzo.com>
CC: Gleb Natapov <g...@kernel.org>
CC: Paolo Bonzini <pbonz...@redhat.com>
CC: Roman Kagan <rka...@virtuozzo.com>
CC: Denis V. Lunev <d...@openvz.org>
CC: qemu-de...@nongnu.org
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
arch/x86/kvm/hyperv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index ca3ce0e..102378f 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);
}
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
