diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-17 16:59:27 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-17 16:59:27 +0300 |
| commit | f44efa5aeaadb0091f90d6888161a0dcb84fa441 (patch) | |
| tree | 195820159823299b700c202feb61988b65e26096 /arch | |
| parent | a8750ddca918032d6349adbf9a4b6555e7db20da (diff) | |
| parent | acfb3b883f6d6a4b5d27ad7fdded11f6a09ae6dd (diff) | |
| download | linux-f44efa5aeaadb0091f90d6888161a0dcb84fa441.tar.xz | |
Merge tag 'kvm-arm-fixes-for-v4.15-3-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.15, Round 3 (v2)
Three more fixes for v4.15 fixing incorrect huge page mappings on systems using
the contigious hint for hugetlbfs; supporting an alternative GICv4 init
sequence; and correctly implementing the ARM SMCC for HVC and SMC handling.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/handle_exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 304203fa9e33..e60494f1eef9 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -45,7 +45,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) ret = kvm_psci_call(vcpu); if (ret < 0) { - kvm_inject_undefined(vcpu); + vcpu_set_reg(vcpu, 0, ~0UL); return 1; } @@ -54,7 +54,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) { - kvm_inject_undefined(vcpu); + vcpu_set_reg(vcpu, 0, ~0UL); return 1; } |