The following commit has been merged into the x86/core branch of tip: Commit-ID: 684b12916a107157633311f07bb74307221eff92 Gitweb: https://git.kernel.org/tip/684b12916a107157633311f07bb74307221eff92 Author: Brian Gerst <brgerst@xxxxxxxxx> AuthorDate: Sun, 02 Feb 2025 15:23:23 -05:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Fri, 21 Feb 2025 22:32:25 +01:00 x86/arch_prctl/64: Clean up ARCH_MAP_VDSO_32 process_64.c is not built on native 32-bit, so CONFIG_X86_32 will never be set. No change in functionality intended. Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Link: https://lore.kernel.org/r/20250202202323.422113-3-brgerst@xxxxxxxxx --- arch/x86/kernel/process_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index e067c61..4ca73dd 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -942,7 +942,7 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2) case ARCH_MAP_VDSO_X32: return prctl_map_vdso(&vdso_image_x32, arg2); # endif -# if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION +# ifdef CONFIG_IA32_EMULATION case ARCH_MAP_VDSO_32: return prctl_map_vdso(&vdso_image_32, arg2); # endif
|