diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2018-07-11 15:56:38 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-07-12 15:40:38 +0200 |
| commit | 25be597ada0b49d2748ab520a78a28c1764d69e4 (patch) | |
| tree | fdb4f3788e6877bc4fc75a8d786a578b4ed77f8b /arch/arm64/kernel/cpu_errata.c | |
| parent | arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> (diff) | |
| download | linux-25be597ada0b49d2748ab520a78a28c1764d69e4.tar.xz linux-25be597ada0b49d2748ab520a78a28c1764d69e4.zip | |
arm64: kill config_sctlr_el1()
Now that we have sysreg_clear_set(), we can consistently use this
instead of config_sctlr_el1().
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Dave Martin <dave.martin@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 94876ab071c7..dec10898d688 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -82,8 +82,7 @@ has_mismatched_cache_type(const struct arm64_cpu_capabilities *entry, static void cpu_enable_trap_ctr_access(const struct arm64_cpu_capabilities *__unused) { - /* Clear SCTLR_EL1.UCT */ - config_sctlr_el1(SCTLR_EL1_UCT, 0); + sysreg_clear_set(sctlr_el1, SCTLR_EL1_UCT, 0); } atomic_t arm64_el2_vector_last_slot = ATOMIC_INIT(-1); |