diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:29:37 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:29:37 +0000 |
| commit | da91747cda0fdbaa05b80becb5cecfac35c8de36 (patch) | |
| tree | 664d9ae407eb5f80c685e5a0a5035d053dadbe1c /arch/arm64/kvm/handle_exit.c | |
| parent | 60dd133a7b77b6adc2d18ff1a85db5a67434a071 (diff) | |
| parent | e5cf9dcdbfd26cd4e1991db08755da900454efeb (diff) | |
Merge branch 'kvm-arm64/for-3.14' into kvm-arm64/nextkvm-arm64/next-3.14-1
Diffstat (limited to 'arch/arm64/kvm/handle_exit.c')
| -rw-r--r-- | arch/arm64/kvm/handle_exit.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 8da56067c304..df84d7bcc7df 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -39,9 +39,6 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) { - if (kvm_psci_call(vcpu)) - return 1; - kvm_inject_undefined(vcpu); return 1; } |