diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2017-02-09 16:01:23 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-02-09 16:01:23 +0100 |
commit | 2e751dfb5ffd20d1a31837dbc9718741df69bffe (patch) | |
tree | 8b7e0e47cf0ef4efda0f1090f0ccbbeb17e5a085 /arch/x86/kvm | |
parent | a0e136d436ded817c0aade72efdefa56a00b4e5e (diff) | |
parent | 7b6b46311a8562fb3a9e035ed6ffab6d49c28886 (diff) | |
download | linux-2e751dfb5ffd20d1a31837dbc9718741df69bffe.tar.bz2 |
Merge tag 'kvmarm-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
kvmarm updates for 4.11
- GICv3 save restore
- Cache flushing fixes
- MSI injection fix for GICv3 ITS
- Physical timer emulation support
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 96dd7dd13ee6..500008f800dc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6263,7 +6263,8 @@ static int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt) kvm_x86_ops->patch_hypercall(vcpu, instruction); - return emulator_write_emulated(ctxt, rip, instruction, 3, NULL); + return emulator_write_emulated(ctxt, rip, instruction, 3, + &ctxt->exception); } static int dm_request_for_irq_injection(struct kvm_vcpu *vcpu) |