Commit bf7f15c5 authored Mar 18, 2020 by Will Deacon Committed by Catalin Marinas Mar 18, 2020

arm64: elf: Fix allnoconfig kernel build with !ARCH_USE_GNU_PROPERTY

Commit ab7876a9 ("arm64: elf: Enable BTI at exec based on ELF
program properties") introduced the conditional selection of
ARCH_USE_GNU_PROPERTY if BINFMT_ELF is enabled. With allnoconfig, this
option is no longer selected and the arm64 arch_parse_elf_property()
function clashes with the generic dummy implementation.

Link: http://lkml.kernel.org/r/20200318082830.GA31312@willie-the-truck

Fixes: ab7876a9 ("arm64: elf: Enable BTI at exec based on ELF program properties")
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent 383499f8

arch/arm64/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ config ARM64
		select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION
		select ARCH_KEEP_MEMBLOCK
		select ARCH_USE_CMPXCHG_LOCKREF
		select ARCH_USE_GNU_PROPERTY if BINFMT_ELF
		select ARCH_USE_GNU_PROPERTY
		select ARCH_USE_QUEUED_RWLOCKS
		select ARCH_USE_QUEUED_SPINLOCKS
		select ARCH_SUPPORTS_MEMORY_FAILURE