From 4c7a6a224703360aac717a1290e1a2ca062d3e6a Mon Sep 17 00:00:00 2001
From: ryo <ryo@NetBSD.org>
Date: Thu, 25 Nov 2021 02:38:56 +0000
Subject: [PATCH] The default name of the `exec_setup_stack' function for
 linux32 should be `linux32_exec_setup_stack', and it should be defined in
 each arch. declaration of linux32_exec_setup_stack() in linux32/amd64 has
 been removed because it does not exist.

NFC.
---
 sys/compat/linux32/arch/amd64/linux32_exec.h | 6 ++----
 sys/compat/linux32/common/linux32_mod.c      | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/compat/linux32/arch/amd64/linux32_exec.h b/sys/compat/linux32/arch/amd64/linux32_exec.h
index cb61cf66595f..295fb3c7431f 100644
--- a/sys/compat/linux32/arch/amd64/linux32_exec.h
+++ b/sys/compat/linux32/arch/amd64/linux32_exec.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_exec.h,v 1.7 2017/04/26 22:41:59 christos Exp $ */
+/*	$NetBSD: linux32_exec.h,v 1.8 2021/11/25 02:38:56 ryo Exp $ */
 
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -82,8 +82,6 @@ struct linux32_extra_stack_data {
 
 #endif
 
-#ifdef _KERNEL
-int linux32_exec_setup_stack(struct lwp *, struct exec_package *);
-#endif
+#define linux32_exec_setup_stack	linux_exec_setup_stack
 
 #endif /* !_AMD64_LINUX32_EXEC_H */
diff --git a/sys/compat/linux32/common/linux32_mod.c b/sys/compat/linux32/common/linux32_mod.c
index 22e78ee090f7..d9d2d9bfb3d1 100644
--- a/sys/compat/linux32/common/linux32_mod.c
+++ b/sys/compat/linux32/common/linux32_mod.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_mod.c,v 1.14 2020/03/21 16:28:56 pgoyette Exp $	*/
+/*	$NetBSD: linux32_mod.c,v 1.15 2021/11/25 02:38:56 ryo Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.14 2020/03/21 16:28:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.15 2021/11/25 02:38:56 ryo Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -76,7 +76,7 @@ static struct execsw linux32_execsw[] = {
 		.es_copyargs = linux32_elf32_copyargs,
 		.es_setregs = NULL,
 		.es_coredump = coredump_elf32,
-		.es_setup_stack = linux_exec_setup_stack,
+		.es_setup_stack = linux32_exec_setup_stack,
 	},
 #endif
 };