Skip to content

Commit 657eef0

Browse files
mrutland-armwilldeacon
authored andcommitted
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: 21fb26b ("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 <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 1e55b44 commit 657eef0

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

arch/arm64/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,6 @@ config ARM64_LSE_ATOMICS
17141714

17151715
config ARM64_USE_LSE_ATOMICS
17161716
bool "Atomic instructions"
1717-
depends on JUMP_LABEL
17181717
default y
17191718
help
17201719
As part of the Large System Extensions, ARMv8.1 introduces new

arch/arm64/include/asm/lse.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <linux/compiler_types.h>
1212
#include <linux/export.h>
13-
#include <linux/jump_label.h>
1413
#include <linux/stringify.h>
1514
#include <asm/alternative.h>
1615
#include <asm/alternative-macros.h>

0 commit comments

Comments
 (0)