Module Name: src
Committed By: ryo
Date: Thu Nov 25 02:38:56 UTC 2021
Modified Files:
src/sys/compat/linux32/arch/amd64: linux32_exec.h
src/sys/compat/linux32/common: linux32_mod.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/linux32/arch/amd64/linux32_exec.h
cvs rdiff -u -r1.14 -r1.15 src/sys/compat/linux32/common/linux32_mod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux32/arch/amd64/linux32_exec.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_exec.h:1.7 src/sys/compat/linux32/arch/amd64/linux32_exec.h:1.8
--- src/sys/compat/linux32/arch/amd64/linux32_exec.h:1.7 Wed Apr 26 22:41:59 2017
+++ src/sys/compat/linux32/arch/amd64/linux32_exec.h Thu Nov 25 02:38:56 2021
@@ -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 */
Index: src/sys/compat/linux32/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.14 src/sys/compat/linux32/common/linux32_mod.c:1.15
--- src/sys/compat/linux32/common/linux32_mod.c:1.14 Sat Mar 21 16:28:56 2020
+++ src/sys/compat/linux32/common/linux32_mod.c Thu Nov 25 02:38:56 2021
@@ -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
};
