Unverified Commit 311b3705 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3737 arm64: Fix compilation error with ILP32 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5PIX3NZYQXRINCPQCYME62CVGY5MSIZ5/ 
This patch fix a few compilation errors with ILP32 support using
openeuler_defconfig.

Changes in v3:
- Revert the problem patch instead of update elf.h.

Jinjie Ruan (3):
  Revert "Kconfig: regularize selection of CONFIG_BINFMT_ELF"
  arm64: Fix compilation error with ILP32 support
  config: Disable CONFIG_COMPAT_BINFMT_ELF as default


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I8S6IA 
 
Link:https://gitee.com/openeuler/kernel/pulls/3737

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents c5cc45ef 3ab5dfcd

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ config ARM64_ERRATUM_834220 


config ARM64_ERRATUM_1742098

	bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence"

	depends on COMPAT

	depends on AARCH32_EL0

	default y

	help

	  This option removes the AES hwcap for aarch32 user-space to

arch/arm64/configs/openeuler_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,6 @@ CONFIG_FREEZER=y 
# Executable file formats

#

CONFIG_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

CONFIG_ARCH_BINFMT_ELF_STATE=y

CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y

CONFIG_ARCH_HAVE_ELF_PROT=y

arch/arm64/include/asm/seccomp.h

+2 −2
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ static inline const int *get_compat_mode1_syscalls(void) 
#define SECCOMP_ARCH_NATIVE		AUDIT_ARCH_AARCH64

#define SECCOMP_ARCH_NATIVE_NR		NR_syscalls

#define SECCOMP_ARCH_NATIVE_NAME	"aarch64"

#ifdef CONFIG_COMPAT

#ifdef CONFIG_AARCH32_EL0

# define SECCOMP_ARCH_COMPAT		AUDIT_ARCH_ARM

# define SECCOMP_ARCH_COMPAT_NR	__NR_compat_syscalls

# define SECCOMP_ARCH_COMPAT_NAME	"arm"

#endif

#endif /* CONFIG_AARCH32_EL0 */



#endif /* _ASM_SECCOMP_H */

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