diff options
| author | Will Deacon <will.deacon@arm.com> | 2019-05-01 15:34:56 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-05-01 15:34:56 +0100 |
| commit | 50abbe19623e08e2aa34e0e526bd6115569f3dc3 (patch) | |
| tree | ecaddb898d671847f70c40fcab5fd115dacc1a1e /arch/arm64/include | |
| parent | 9431ac2bf6b742d87cdac051adc1976308070110 (diff) | |
| parent | 4ad499c94264a2ee05aacc518b9bde658318e510 (diff) | |
Merge branch 'for-next/mitigations' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core
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 a3f028f82def..f210bcf096f7 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -633,11 +633,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); |