diff options
author | Marc Zyngier <maz@kernel.org> | 2020-12-09 13:00:24 +0300 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-12-09 13:00:24 +0300 |
commit | 3a514592b698588326924625b6948a10c35fadd5 (patch) | |
tree | 1209f5cb0a780f87c41e3299b22776a221766892 /arch/arm64/kernel/proton-pack.c | |
parent | 17f84520cb8fcaf475c96c3ee90dd97b55a63669 (diff) | |
parent | 0cc519f85a527e1c5ad5a7f182105fe614e9ff80 (diff) | |
download | linux-3a514592b698588326924625b6948a10c35fadd5.tar.xz |
Merge remote-tracking branch 'origin/kvm-arm64/psci-relay' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/proton-pack.c')
-rw-r--r-- | arch/arm64/kernel/proton-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index fca03648e270..902e4084c477 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -24,6 +24,7 @@ #include <linux/prctl.h> #include <linux/sched/task_stack.h> +#include <asm/insn.h> #include <asm/spectre.h> #include <asm/traps.h> #include <asm/virt.h> @@ -520,12 +521,12 @@ static enum mitigation_state spectre_v4_enable_hw_mitigation(void) if (spectre_v4_mitigations_off()) { sysreg_clear_set(sctlr_el1, 0, SCTLR_ELx_DSSBS); - asm volatile(SET_PSTATE_SSBS(1)); + set_pstate_ssbs(1); return SPECTRE_VULNERABLE; } /* SCTLR_EL1.DSSBS was initialised to 0 during boot */ - asm volatile(SET_PSTATE_SSBS(0)); + set_pstate_ssbs(0); return SPECTRE_MITIGATED; } |