diff options
| author | Will Deacon <will@kernel.org> | 2021-02-12 14:57:13 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-12 14:57:13 +0000 |
| commit | 90eb8c9d94fa7f9969792584c376b435bf8a035c (patch) | |
| tree | 3e10c3f5580d0bb4388bc8c832ae79f25e0f8e6d /arch/arm64/kernel/cpu_errata.c | |
| parent | f96a816fa5e5b7bdbfc1802dfb7f8155df2746d0 (diff) | |
| parent | 6459b8469753e9feaa8b34691d097cffad905931 (diff) | |
Merge branch 'for-next/errata' into for-next/core
Rework of the workaround for Cortex-A76 erratum 1463225 to fit in better
with the ongoing exception entry cleanups and changes to the detection
code for Cortex-A55 erratum 1024718 since it applies to all revisions of
the silicon.
* for-next/errata:
arm64: entry: consolidate Cortex-A76 erratum 1463225 workaround
arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index a63428301f42..506a1cd37973 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -107,8 +107,6 @@ cpu_enable_trap_ctr_access(const struct arm64_cpu_capabilities *cap) } #ifdef CONFIG_ARM64_ERRATUM_1463225 -DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463225_wa); - static bool has_cortex_a76_erratum_1463225(const struct arm64_cpu_capabilities *entry, int scope) |