[PATCH 05/15] x86: Remove AT_VECTOR_SIZE_ARCH from UAPI
Thomas Weißschuh <[email protected]>
| Newsgroups | org.kernel.vger.sparclinux,dev.linux.lists.loongarch,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-riscv,org.kernel.vger.linux-alpha,org.kernel.vger.linux-arch,org.kernel.vger.linux-kernel,org.kernel.vger.linux-mips,org.kernel.vger.linux-s390,org.kernel.vger.linux-sh,org.kvack.linux-mm,org.ozlabs.lists.linuxppc-dev |
|---|---|
| Message-ID | <[email protected]> |
There is nothing userspace can do with this value. In the kernel is always combined with AT_VECTOR_SIZE_BASE, which is not exposed to userspace and also changes from time to time. Move the symbol to a kernel-internal header. Signed-off-by: Thomas Weißschuh <[email protected]> --- arch/x86/include/asm/auxvec.h | 12 ++++++++++++ arch/x86/include/uapi/asm/auxvec.h | 13 +++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/auxvec.h b/arch/x86/include/asm/auxvec.h new file mode 100644 index 000000000000..ed26ad09f3e3 --- /dev/null +++ b/arch/x86/include/asm/auxvec.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_AUXVEC_H +#define _ASM_X86_AUXVEC_H + +/* entries in ARCH_DLINFO: */ +#if defined(CONFIG_IA32_EMULATION) || !defined(CONFIG_X86_64) +# define AT_VECTOR_SIZE_ARCH 3 +#else /* else it's non-compat x86-64 */ +# define AT_VECTOR_SIZE_ARCH 2 +#endif + +#endif /* _ASM_X86_AUXVEC_H */ diff --git a/arch/x86/include/uapi/asm/auxvec.h b/arch/x86/include/uapi/asm/auxvec.h index bdde9e18f94e..6677c9ace117 100644 --- a/arch/x86/include/uapi/asm/auxvec.h +++ b/arch/x86/include/uapi/asm/auxvec.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_X86_AUXVEC_H -#define _ASM_X86_AUXVEC_H +#ifndef _UAPI_ASM_X86_AUXVEC_H +#define _UAPI_ASM_X86_AUXVEC_H /* * Architecture-neutral AT_ values in 0-17, leave some room * for more of them, start the x86-specific ones at 32. @@ -10,11 +10,4 @@ #endif #define AT_SYSINFO_EHDR 33 -/* entries in ARCH_DLINFO: */ -#if defined(__KERNEL__) && (defined(CONFIG_IA32_EMULATION) || !defined(CONFIG_X86_64)) -# define AT_VECTOR_SIZE_ARCH 3 -#else /* else it's non-compat x86-64 */ -# define AT_VECTOR_SIZE_ARCH 2 -#endif - -#endif /* _ASM_X86_AUXVEC_H */ +#endif /* _UAPI_ASM_X86_AUXVEC_H */ -- 2.53.0