diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2018-10-19 15:24:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-10-19 15:24:24 +0200 |
| commit | e42b4a507efa19a90c63e7968c93c4f82d3bc805 (patch) | |
| tree | cc7bf34323b26d3f53d4a9ec4ca1b5c52bc361cd /arch/arm64/include/asm/kvm_asm.h | |
| parent | KVM: VMX: enable nested virtualization by default (diff) | |
| parent | KVM: arm64: Safety check PSTATE when entering guest and handle IL (diff) | |
| download | linux-dev-e42b4a507efa19a90c63e7968c93c4f82d3bc805.tar.xz linux-dev-e42b4a507efa19a90c63e7968c93c4f82d3bc805.zip | |
Merge tag 'kvmarm-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for 4.20
- Improved guest IPA space support (32 to 52 bits)
- RAS event delivery for 32bit
- PMU fixes
- Guest entry hardening
- Various cleanups
Diffstat (limited to 'arch/arm64/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_asm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 102b5a5c47b6..aea01a09eb94 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -30,6 +30,7 @@ #define ARM_EXCEPTION_IRQ 0 #define ARM_EXCEPTION_EL1_SERROR 1 #define ARM_EXCEPTION_TRAP 2 +#define ARM_EXCEPTION_IL 3 /* The hyp-stub will return this for any kvm_call_hyp() call */ #define ARM_EXCEPTION_HYP_GONE HVC_STUB_ERR @@ -72,8 +73,6 @@ extern void __vgic_v3_init_lrs(void); extern u32 __kvm_get_mdcr_el2(void); -extern u32 __init_stage2_translation(void); - /* Home-grown __this_cpu_{ptr,read} variants that always work at HYP */ #define __hyp_this_cpu_ptr(sym) \ ({ \ |