Commit 657eef0a authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

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:

  21fb26bf ("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: default avatarMark 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: default avatarWill Deacon <will@kernel.org>
parent 1e55b44d

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1714,7 +1714,6 @@ config ARM64_LSE_ATOMICS 


config ARM64_USE_LSE_ATOMICS

	bool "Atomic instructions"

	depends on JUMP_LABEL

	default y

	help

	  As part of the Large System Extensions, ARMv8.1 introduces new

arch/arm64/include/asm/lse.h

+0 −1
Original line number Diff line number Diff line
@@ -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>