Upcoming changes will create architecture-specific asm/auxvec.h headers. Add asm-generic infrastructure to handle the fallbacks for architectures which are not migrated yet and those which won't require their own definition. Extend the list of includes in linux/auxvec.h to cover all potential low-level auxvec.h headers. Signed-off-by: Thomas Weißschuh --- MAINTAINERS | 2 ++ include/asm-generic/Kbuild | 1 + include/asm-generic/auxvec.h | 7 +++++++ include/linux/auxvec.h | 2 ++ 4 files changed, 12 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7a2c952d72bd..239c4e3ef5c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9573,12 +9573,14 @@ L: linux-mm@kvack.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve F: Documentation/userspace-api/ELF.rst +F: arch/*/include/asm/auxvec.h F: arch/*/include/uapi/asm/auxvec.h F: fs/*binfmt_*.c F: fs/Kconfig.binfmt F: fs/exec.c F: fs/tests/binfmt_*_kunit.c F: fs/tests/exec_kunit.c +F: include/asm-generic/auxvec.h F: include/linux/auxvec.h F: include/linux/binfmts.h F: include/linux/elf.h diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 9aff61e7b8f2..756a991aef67 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild @@ -6,6 +6,7 @@ mandatory-y += atomic.h mandatory-y += archrandom.h +mandatory-y += auxvec.h mandatory-y += barrier.h mandatory-y += bitops.h mandatory-y += bug.h diff --git a/include/asm-generic/auxvec.h b/include/asm-generic/auxvec.h new file mode 100644 index 000000000000..e4abd2a8c5ed --- /dev/null +++ b/include/asm-generic/auxvec.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_GENERIC_AUXVAL_H__ +#define __ASM_GENERIC_AUXVAL_H__ + +#define AT_VECTOR_SIZE_ARCH 0 + +#endif diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h index 943e8b80b41e..68c9d6b118a9 100644 --- a/include/linux/auxvec.h +++ b/include/linux/auxvec.h @@ -2,7 +2,9 @@ #ifndef _LINUX_AUXVEC_H #define _LINUX_AUXVEC_H +#include #include +#include #define AT_VECTOR_SIZE_BASE 22 /* NEW_AUX_ENT entries in auxiliary table */ /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */ -- 2.53.0