diff options
| author | Jeremy Linton <jeremy.linton@arm.com> | 2019-04-15 16:21:27 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-04-26 16:32:45 +0100 |
| commit | d42281b6e49510f078ace15a8ea10f71e6262581 (patch) | |
| tree | 232ae720c361bc84f51245f188a3fb4a90389bc3 /arch/arm64/include | |
| parent | d2532e27b5638bb2e2dd52b80b7ea2ec65135377 (diff) | |
| download | linux-d42281b6e49510f078ace15a8ea10f71e6262581.tar.bz2 | |
arm64: Always enable ssb vulnerability detection
Ensure we are always able to detect whether or not the CPU is affected
by SSB, so that we can later advertise this to userspace.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
[will: Use IS_ENABLED instead of #ifdef]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/cpufeature.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index e505e1fbd2b9..6ccdc97e5d6a 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -638,11 +638,7 @@ static inline int arm64_get_ssbd_state(void) #endif } -#ifdef CONFIG_ARM64_SSBD void arm64_set_ssbd_mitigation(bool state); -#else -static inline void arm64_set_ssbd_mitigation(bool state) {} -#endif extern int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt); |