diff options
author | Mark Rutland <mark.rutland@arm.com> | 2018-07-11 14:56:38 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2018-07-12 14:40:38 +0100 |
commit | 25be597ada0b49d2748ab520a78a28c1764d69e4 (patch) | |
tree | fdb4f3788e6877bc4fc75a8d786a578b4ed77f8b /arch/arm64/mm/fault.c | |
parent | 1c312e84c2d71da4101754fa6118f703f7473e01 (diff) | |
download | linux-25be597ada0b49d2748ab520a78a28c1764d69e4.tar.gz linux-25be597ada0b49d2748ab520a78a28c1764d69e4.tar.bz2 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/mm/fault.c')
-rw-r--r-- | arch/arm64/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index b8eecc7b9531..ea591c9e5144 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -879,7 +879,7 @@ void cpu_enable_pan(const struct arm64_cpu_capabilities *__unused) */ WARN_ON_ONCE(in_interrupt()); - config_sctlr_el1(SCTLR_EL1_SPAN, 0); + sysreg_clear_set(sctlr_el1, SCTLR_EL1_SPAN, 0); asm(SET_PSTATE_PAN(1)); } #endif /* CONFIG_ARM64_PAN */ |