diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 19:53:33 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 19:54:48 +0800 |
| commit | cd1fe2006b62234455a91e428bad45331dc79250 (patch) | |
| tree | 5fca3d52a0d3f6edbb4352d6b54f3155d7e2c100 /arch/arm64/kvm/handle_exit.c | |
| parent | 824ce96ff92c399f5bd2ee308f231300e7e89174 (diff) | |
| parent | 6fdbca2f35ee3e80079b31a5cda7bb6fec8def39 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.02-rt
Conflicts:
lsk has current_stack_pointer and arch_within_stack_frames
in arch/x86/include/asm/thread_info.h
Diffstat (limited to 'arch/arm64/kvm/handle_exit.c')
| -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 e47f9bc71079..51abbd1d98e3 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -43,7 +43,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; } @@ -52,7 +52,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; } |