diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-27 22:48:24 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 22:48:24 +0300 |
| commit | 90f0e16c649ac3e93094cb491072d6424f53be43 (patch) | |
| tree | 42d6887207065642b46baad0132fe363c8255afa /arch/arm64/include/asm | |
| parent | bb528f4f57d096793c133f44e1ac70db602d8c28 (diff) | |
| parent | bf118a5cb7e6d17e7ec9492e4dc676e7e7b69d01 (diff) | |
| download | linux-90f0e16c649ac3e93094cb491072d6424f53be43.tar.xz | |
Merge branch 'kvm-arm64/misc-5.11' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm')
| -rw-r--r-- | arch/arm64/include/asm/cpufeature.h | 5 | ||||
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index da250e4741bd..461277ae7a48 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -699,6 +699,11 @@ static inline bool system_supports_generic_auth(void) cpus_have_const_cap(ARM64_HAS_GENERIC_AUTH); } +static inline bool system_has_full_ptr_auth(void) +{ + return system_supports_address_auth() && system_supports_generic_auth(); +} + static __always_inline bool system_uses_irq_prio_masking(void) { return IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index ac11adab6602..d254c7794bfa 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -58,8 +58,6 @@ int kvm_arm_init_sve(void); int __attribute_const__ kvm_target_cpu(void); int kvm_reset_vcpu(struct kvm_vcpu *vcpu); void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu); -int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext); -void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start); struct kvm_vmid { /* The VMID generation used for the virt. memory system */ @@ -89,6 +87,9 @@ struct kvm_s2_mmu { struct kvm *kvm; }; +struct kvm_arch_memory_slot { +}; + struct kvm_arch { struct kvm_s2_mmu mmu; |