diff options
| author |   Will Deacon <will@kernel.org> | 2020-03-18 08:28:31 +0000 |
|---|---|---|
| committer |   Catalin Marinas <catalin.marinas@arm.com> | 2020-03-18 13:57:17 +0000 |
| commit | bf7f15c585d5b9b843e662aa78f9fc71037db968 (patch) | |
| tree | 1cffb9abaf0cc2f04bdd17c74b03795943464469 /arch/arm64/Kconfig | |
| parent | arm64: BTI: Add Kconfig entry for userspace BTI (diff) | |
| download | wireguard-linux-bf7f15c585d5b9b843e662aa78f9fc71037db968.tar.xz wireguard-linux-bf7f15c585d5b9b843e662aa78f9fc71037db968.zip | |
arm64: elf: Fix allnoconfig kernel build with !ARCH_USE_GNU_PROPERTY
Commit ab7876a98a21 ("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: ab7876a98a21 ("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>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d65d226a77ec..53c77711f752 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -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 |