diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2018-01-03 16:38:35 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-16 20:06:41 +0100 |
| commit | 9a7a2f40da4a334a379c7a4fc472a15e9d04104d (patch) | |
| tree | bab243c8e1a0d800e7f1b374f5bf44b533f1dcb9 /arch/arm | |
| parent | 7c2108a2db4914af9e22e53cbc83c49fc42ac472 (diff) | |
| download | linux-stable-9a7a2f40da4a334a379c7a4fc472a15e9d04104d.tar.gz linux-stable-9a7a2f40da4a334a379c7a4fc472a15e9d04104d.tar.bz2 linux-stable-9a7a2f40da4a334a379c7a4fc472a15e9d04104d.zip | |
arm64: KVM: Use per-CPU vector when BP hardening is enabled
Commit 6840bdd73d07 upstream.
Now that we have per-CPU vectors, let's plug then in the KVM/arm64 code.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Conflicts:
arch/arm/include/asm/kvm_mmu.h
arch/arm64/include/asm/kvm_mmu.h
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/kvm_mmu.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h index fa6f2174276b..eb46fc81a440 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -221,6 +221,16 @@ static inline unsigned int kvm_get_vmid_bits(void) return 8; } +static inline void *kvm_get_hyp_vector(void) +{ + return kvm_ksym_ref(__kvm_hyp_vector); +} + +static inline int kvm_map_vectors(void) +{ + return 0; +} + #endif /* !__ASSEMBLY__ */ #endif /* __ARM_KVM_MMU_H__ */ |