diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-04 09:15:45 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-04 09:15:45 +0530 |
| commit | 8d13ea761e92d9f28f0cc474d8c2f411bcd2d08b (patch) | |
| tree | 81e1736f996702e84c4372a5094841af049fb01b /arch/x86/kvm/x86.c | |
| parent | 79202ff9eb5cb9515b2fea57ad5bfbcfe78279b6 (diff) | |
| parent | e68d6189c7872b2b3731276bda5f5e0c8d5ba644 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.109-hikey
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e5f44f33de89..796f1ec67469 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6941,7 +6941,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) #endif kvm_rip_write(vcpu, regs->rip); - kvm_set_rflags(vcpu, regs->rflags); + kvm_set_rflags(vcpu, regs->rflags | X86_EFLAGS_FIXED); vcpu->arch.exception.pending = false; |