diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2018-01-03 17:38:35 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-01-08 19:46:56 +0100 |
| commit | 6840bdd73d07216ab4bc46f5a8768c37ea519038 (patch) | |
| tree | c2322ae1567cb33991bd5c987604704bc208bd31 /arch/arm64/kvm | |
| parent | arm64: Add skeleton to harden the branch predictor against aliasing attacks (diff) | |
| download | linux-6840bdd73d07216ab4bc46f5a8768c37ea519038.tar.xz linux-6840bdd73d07216ab4bc46f5a8768c37ea519038.zip | |
arm64: KVM: Use per-CPU vector when BP hardening is enabled
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>
Diffstat (limited to 'arch/arm64/kvm')
| -rw-r--r-- | arch/arm64/kvm/hyp/switch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index f7c651f3a8c0..8d4f3c9d6dc4 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -52,7 +52,7 @@ static void __hyp_text __activate_traps_vhe(void) val &= ~(CPACR_EL1_FPEN | CPACR_EL1_ZEN); write_sysreg(val, cpacr_el1); - write_sysreg(__kvm_hyp_vector, vbar_el1); + write_sysreg(kvm_get_hyp_vector(), vbar_el1); } static void __hyp_text __activate_traps_nvhe(void) |