Commit 396a5d4a authored by Stephen Boyd's avatar Stephen Boyd Committed by Will Deacon
Browse files

arm64: Unconditionally support {ARCH_}HAVE_NMI{_SAFE_CMPXCHG} 



From what I can see there isn't anything about ACPI_APEI_SEA that
means the arm64 architecture can or cannot support NMI safe
cmpxchg or NMIs, so the 'if' condition here is not important.
Let's remove it. Doing that allows us to support ftrace
histograms via CONFIG_HIST_TRIGGERS that depends on the arch
having the ARCH_HAVE_NMI_SAFE_CMPXCHG config selected.

Cc: Tyler Baicar <tbaicar@codeaurora.org>
Cc: Jonathan (Zhixiong) Zhang <zjzhang@codeaurora.org>
Cc: Dongjiu Geng <gengdongjiu@huawei.com>
Acked-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent d1809d0e

arch/arm64/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config ARM64 
	select ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_STRICT_MODULE_RWX

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select ARCH_SUPPORTS_ATOMIC_RMW
@@ -98,7 +98,7 @@ config ARM64 
	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP if NUMA

	select HAVE_NMI if ACPI_APEI_SEA

	select HAVE_NMI

	select HAVE_PATA_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

CRA Git | Maintained and supported by SUSTech CRA and CCSE