Skip to content

Commit 31c84d6

Browse files
Marc Zyngierwilldeacon
authored andcommitted
arm64: Get rid of arm64_ssbd_state
Out with the old ghost, in with the new... Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Will Deacon <will@kernel.org>
1 parent d63d975 commit 31c84d6

2 files changed

Lines changed: 0 additions & 16 deletions

File tree

arch/arm64/include/asm/cpufeature.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -698,20 +698,6 @@ static inline bool system_supports_tlb_range(void)
698698
cpus_have_const_cap(ARM64_HAS_TLB_RANGE);
699699
}
700700

701-
#define ARM64_SSBD_UNKNOWN -1
702-
#define ARM64_SSBD_FORCE_DISABLE 0
703-
#define ARM64_SSBD_KERNEL 1
704-
#define ARM64_SSBD_FORCE_ENABLE 2
705-
#define ARM64_SSBD_MITIGATED 3
706-
707-
static inline int arm64_get_ssbd_state(void)
708-
{
709-
extern int ssbd_state;
710-
return ssbd_state;
711-
}
712-
713-
void arm64_set_ssbd_mitigation(bool state);
714-
715701
extern int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);
716702

717703
static inline u32 id_aa64mmfr0_parange_to_phys_shift(int parange)

arch/arm64/kernel/cpu_errata.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ cpu_enable_trap_ctr_access(const struct arm64_cpu_capabilities *cap)
106106
sysreg_clear_set(sctlr_el1, SCTLR_EL1_UCT, 0);
107107
}
108108

109-
int ssbd_state __read_mostly = ARM64_SSBD_UNKNOWN;
110-
111109
#ifdef CONFIG_ARM64_ERRATUM_1463225
112110
DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463225_wa);
113111

0 commit comments

Comments
 (0)