Commit a6ed539b authored by Jinjie Ruan's avatar Jinjie Ruan
Browse files

Revert "Kconfig: regularize selection of CONFIG_BINFMT_ELF" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8S6IA



-------------------------------------------------

This reverts commit 41026c34.

Since commit 7de3ab4c ("arm64: introduce binfmt_elf32.c"), whether it
is ILP32 or AARCH32_EL0, fs/compat_binfmt.c is not used for arm64. So it
is not reasonable to be default y for COMPAT_BINFMT_ELF and revert it to
to make all architectures to individually select it.

Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
parent 21138a06

arch/mips/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -3085,6 +3085,7 @@ config MIPS32_O32 
	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT

	select MIPS32_COMPAT

	select COMPAT_BINFMT_ELF

	help

	  Select this option if you want to run o32 binaries.  These are pure

	  32-bit binaries as used by the 32-bit Linux/MIPS port.  Most of
@@ -3097,6 +3098,7 @@ config MIPS32_N32 
	depends on 64BIT

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select COMPAT

	select COMPAT_BINFMT_ELF

	select MIPS32_COMPAT

	help

	  Select this option if you want to run n32 binaries.  These are

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ source "kernel/Kconfig.hz" 
config COMPAT

	def_bool y

	depends on 64BIT

	select COMPAT_BINFMT_ELF if BINFMT_ELF



config AUDIT_ARCH

	def_bool y

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ config COMPAT 
	depends on PPC64

	depends on !CC_IS_CLANG || CLANG_VERSION >= 120000

	default y if !CPU_LITTLE_ENDIAN

	select COMPAT_BINFMT_ELF

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ config COMMAND_LINE_SIZE 
config COMPAT

	def_bool y

	prompt "Kernel support for 31 bit emulation"

	select COMPAT_BINFMT_ELF if BINFMT_ELF

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION

	select HAVE_UID16

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ config COMPAT 
	bool

	depends on SPARC64

	default y

	select COMPAT_BINFMT_ELF

	select HAVE_UID16

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION