diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-22 17:45:05 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-22 17:45:05 +0100 |
| commit | 71783e09b4874c845819b5658b968d8b5b899333 (patch) | |
| tree | ea5d4d8cdcd43f36e9e59e6d12cbd54f9ff03f66 /arch/arm/kvm/hyp/hyp-entry.S | |
| parent | 8f060f53554cf58dcb28c85ff05d03ed8b02f4b2 (diff) | |
| parent | c88b093693ccbe41991ef2e9b1d251945e6e54ed (diff) | |
| download | linux-stable-71783e09b4874c845819b5658b968d8b5b899333.tar.gz linux-stable-71783e09b4874c845819b5658b968d8b5b899333.tar.bz2 linux-stable-71783e09b4874c845819b5658b968d8b5b899333.zip | |
Merge tag 'kvmarm-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
KVM/arm updates for Linux v5.1
- A number of pre-nested code rework
- Direct physical timer assignment on VHE systems
- kvm_call_hyp type safety enforcement
- Set/Way cache sanitisation for 32bit guests
- Build system cleanups
- A bunch of janitorial fixes
Diffstat (limited to 'arch/arm/kvm/hyp/hyp-entry.S')
| -rw-r--r-- | arch/arm/kvm/hyp/hyp-entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/hyp/hyp-entry.S b/arch/arm/kvm/hyp/hyp-entry.S index aa3f9a9837ac..6ed3cf23fe89 100644 --- a/arch/arm/kvm/hyp/hyp-entry.S +++ b/arch/arm/kvm/hyp/hyp-entry.S @@ -176,7 +176,7 @@ THUMB( orr lr, lr, #PSR_T_BIT ) msr spsr_cxsf, lr ldr lr, =panic msr ELR_hyp, lr - ldr lr, =kvm_call_hyp + ldr lr, =__kvm_call_hyp clrex eret ENDPROC(__hyp_do_panic) |