]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set
authorRandy Dunlap <rdunlap@infradead.org>
Thu, 26 Nov 2020 00:40:11 +0000 (16:40 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Mar 2021 15:44:20 +0000 (16:44 +0100)
[ Upstream commit 80bddf5c93a99e11fc9faf7e4b575d01cecd45d3 ]

Currently COMPAT on SPARC64 selects COMPAT_BINFMT_ELF unconditionally,
even when BINFMT_ELF is not enabled. This causes a kconfig warning.

Instead, just select COMPAT_BINFMT_ELF if BINFMT_ELF is enabled.
This builds cleanly with no kconfig warnings.

WARNING: unmet direct dependencies detected for COMPAT_BINFMT_ELF
  Depends on [n]: COMPAT [=y] && BINFMT_ELF [=n]
  Selected by [y]:
  - COMPAT [=y] && SPARC64 [=y]

Fixes: 26b4c912185a ("sparc,sparc64: unify Kconfig files")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/sparc/Kconfig

index 94f4ac21761bf2e55d8af8b2a71e59c3f3055cf9..f42973685fd2cea33cd8792eea8d38a9de81c4f1 100644 (file)
@@ -539,7 +539,7 @@ config COMPAT
        bool
        depends on SPARC64
        default y
-       select COMPAT_BINFMT_ELF
+       select COMPAT_BINFMT_ELF if BINFMT_ELF
        select HAVE_UID16
        select ARCH_WANT_OLD_COMPAT_IPC
        select COMPAT_OLD_SIGACTION