Commit 38fabd54 authored by Jinjie Ruan's avatar Jinjie Ruan
Browse files

arm64: Fix compilation error with ILP32 support

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



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

This patch fix the following compilation errors with ILP32 support
using openeuler_defcofig.

When ILP32 support is enabled, compilation on ARM64 would complain
about an undeclared __NR_compat_syscalls, since commit b16c8a68
("arm64: ilp32: introduce syscall table for ILP32") changes the config
that __NR_compat_syscalls depends on but commit dbece8b0 ("arm64:
rename COMPAT to AARCH32_EL0") ignores it for __NR_compat_syscalls.
Modify the config for SECCOMP_ARCH_COMPAT_NR accordingly.

And commit dbece8b0 ("arm64: rename COMPAT to AARCH32_EL0") ignores
ARM64_ERRATU_1742098 which only depends on AARCH32_EL0 but not ARM64_ILP32.

	./arch/arm64/include/asm/seccomp.h:57:33: error: ‘__NR_compat_syscalls’ undeclared here (not in a function); did you mean ‘in_compat_syscall’?
	   57 | # define SECCOMP_ARCH_COMPAT_NR __NR_compat_syscalls

	./arch/arm64/kernel/cpufeature.c:2200:17: error: ‘a32_elf_hwcap2’ undeclared (first use in this function); did you mean ‘elf_hwcap’?
	 2200 |                 a32_elf_hwcap2 &= ~COMPAT_HWCAP2_AES;
	      |                 ^~~~~~~~~~~~~~
	      |                 elf_hwcap

Fixes: dbece8b0 ("arm64: rename COMPAT to AARCH32_EL0")
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
parent a6ed539b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment