summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/lse.h
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2022-11-14 15:54:24 +0300
committerWill Deacon <will@kernel.org>2022-11-14 17:44:14 +0300
commit657eef0a5420a02c02945ed8c87f2ddcbd255772 (patch)
tree0a5cdb9e677918babc3865a61b6730f8fbf08497 /arch/arm64/include/asm/lse.h
parent1e55b44d9ecd42dee7106ce635ffd855183f5221 (diff)
downloadlinux-657eef0a5420a02c02945ed8c87f2ddcbd255772.tar.xz
arm64: atomics: lse: remove stale dependency on JUMP_LABEL
Currently CONFIG_ARM64_USE_LSE_ATOMICS depends upon CONFIG_JUMP_LABEL, as the inline atomics were indirected with a static branch. However, since commit: 21fb26bfb01ffe0d ("arm64: alternatives: add alternative_has_feature_*()") ... we use an alternative_branch (which is always available) rather than a static branch, and hence the dependency is unnecessary. Remove the stale dependency, along with the stale include. This will allow the use of LSE atomics in kernels built with CONFIG_JUMP_LABEL=n, and reduces the risk of circular header dependencies via <asm/lse.h>. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20221114125424.2998268-1-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/lse.h')
-rw-r--r--arch/arm64/include/asm/lse.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h
index c503db8e73b0..f99d74826a7e 100644
--- a/arch/arm64/include/asm/lse.h
+++ b/arch/arm64/include/asm/lse.h
@@ -10,7 +10,6 @@
#include <linux/compiler_types.h>
#include <linux/export.h>
-#include <linux/jump_label.h>
#include <linux/stringify.h>
#include <asm/alternative.h>
#include <asm/alternative-macros.h>