CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Jan 25 10:13:07 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c
Log Message:
Revert previous change(s). There's no good reason to use the hook when
the required value is available locally (in the current module).
Thanks mrg@ for pointing this out.
To generate a diff of this commit:
cvs rdiff -u -r1.38.2.5 -r1.38.2.6 src/sys/compat/netbsd32/netbsd32_sysctl.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/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.5 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.6
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.5 Thu Jan 24 04:32:41 2019
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Fri Jan 25 10:13:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.6 2019/01/25 10:13:07 pgoyette Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.6 2019/01/25 10:13:07 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#include
#include
#include
-#include
#include
@@ -123,7 +122,7 @@ void
netbsd32_sysctl_init(void)
{
const struct sysctlnode *_root = _sysctl_root;
- const char *m;
+ extern const char machine32[];
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
@@ -171,11 +170,10 @@ netbsd32_sysctl_init(void)
CTLTYPE_INT, "alignbytes", NULL,
NULL, ALIGNBYTES32, NULL, 0,
CTL_HW, HW_ALIGNBYTES, CTL_EOL);
- MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m);
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRING, "machine", NULL,
- NULL, 0, __UNCONST(m), 0,
+ NULL, 0, __UNCONST(), 0,
CTL_HW, HW_MACHINE, CTL_EOL);
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CVS commit: [pgoyette-compat] src/sys/compat/linux32/common
Module Name:src
Committed By: pgoyette
Date: Thu Jan 24 06:48:27 UTC 2019
Modified Files:
src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c
Log Message:
Restore the MD-vs-REQ requirements structure, just in case
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.4 -r1.11.2.5 \
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/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.4 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.5
--- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.4 Thu Jan 24 06:23:26 2019
+++ src/sys/compat/linux32/common/linux32_mod.c Thu Jan 24 06:48:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $ */
+/* $NetBSD: linux32_mod.c,v 1.11.2.5 2019/01/24 06:48:27 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.5 2019/01/24 06:48:27 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -51,11 +51,16 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.
#include
#include
-#define REQ1 "exec_elf32,compat_netbsd32,compat_linux"
-#define REQ2 ",sysv_ipc,compat_netbsd32_sysvipc,compat_sysv_50"
-#define REQ3 ",compat_netbsd32_50,compat_netbsd32_43"
+#if defined(EXEC_ELF32)
+# define MD1 ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc"
+#else
+# define MD1 ""
+#endif
+
+#define REQ1 "compat_linux,sysv_ipc,compat_sysv_50"
+#define REQ2 ",compat_netbsd32_50,compat_netbsd32_43"
-MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3);
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 MD1);
static struct execsw linux32_execsw[] = {
#if defined(EXEC_ELF32)
CVS commit: [pgoyette-compat] src/sys/compat/linux32/common
Module Name:src
Committed By: pgoyette
Date: Thu Jan 24 06:23:26 UTC 2019
Modified Files:
src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c
Log Message:
Clean up and reorganize the requirements for compat_linux32 module
To generate a diff of this commit:
cvs rdiff -u -r1.11.2.3 -r1.11.2.4 \
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/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.3 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.4
--- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.3 Wed Sep 12 08:09:23 2018
+++ src/sys/compat/linux32/common/linux32_mod.c Thu Jan 24 06:23:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $ */
+/* $NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -51,18 +51,11 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.
#include
#include
-#if defined(EXEC_ELF32)
-# define MD1 ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc"
-#else
-# define MD1 ""
-#endif
-
-#define REQ1 "compat_linux,compat_sysv_50"
-#define REQ2 ",compat_netbsd32_43,compat_netbsd32_50,compat_netbsd32_12"
-#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16"
-#define REQ4",compat_ossaudio,sysv_ipc,compat_netbsd32_sysvipc"
+#define REQ1 "exec_elf32,compat_netbsd32,compat_linux"
+#define REQ2 ",sysv_ipc,compat_netbsd32_sysvipc,compat_sysv_50"
+#define REQ3 ",compat_netbsd32_50,compat_netbsd32_43"
-MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3 REQ4 MD1);
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3);
static struct execsw linux32_execsw[] = {
#if defined(EXEC_ELF32)
CVS commit: [pgoyette-compat] src/sys/compat/linux/common
Module Name:src Committed By: pgoyette Date: Thu Jan 24 05:06:43 UTC 2019 Modified Files: src/sys/compat/linux/common [pgoyette-compat]: linux_exec_elf32.c Log Message: Move the definition around to avoid strange compiler error (something about trying to set a section attribute on a local variable). To generate a diff of this commit: cvs rdiff -u -r1.94.12.6 -r1.94.12.7 \ src/sys/compat/linux/common/linux_exec_elf32.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/linux/common/linux_exec_elf32.c diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.6 src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.7 --- src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.6 Thu Jan 24 04:52:58 2019 +++ src/sys/compat/linux/common/linux_exec_elf32.c Thu Jan 24 05:06:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_elf32.c,v 1.94.12.6 2019/01/24 04:52:58 pgoyette Exp $ */ +/* $NetBSD: linux_exec_elf32.c,v 1.94.12.7 2019/01/24 05:06:43 pgoyette Exp $ */ /*- * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.6 2019/01/24 04:52:58 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.7 2019/01/24 05:06:43 pgoyette Exp $"); #ifndef ELFSIZE /* XXX should die */ @@ -74,6 +74,10 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_e #include #include +#if (ELFSIZE == 32) + MODULE_HOOK(netbsd32_machine32_hook, const char *, (void)); +#endif + #define LINUX_GO_RT0_SIGNATURE #ifdef DEBUG_LINUX @@ -335,7 +339,6 @@ ELFNAME2(linux,go_rt0_signature)(struct goto out; #if (ELFSIZE == 32) - MODULE_HOOK(netbsd32_machine32_hook, const char *, (void)); extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook; MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); #else
CVS commit: [pgoyette-compat] src/sys/compat/linux/common
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:52:58 UTC 2019 Modified Files: src/sys/compat/linux/common [pgoyette-compat]: linux_exec_elf32.c Log Message: revert previous, just define the hook here To generate a diff of this commit: cvs rdiff -u -r1.94.12.5 -r1.94.12.6 \ src/sys/compat/linux/common/linux_exec_elf32.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/linux/common/linux_exec_elf32.c diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.5 src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.6 --- src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.5 Thu Jan 24 04:41:34 2019 +++ src/sys/compat/linux/common/linux_exec_elf32.c Thu Jan 24 04:52:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_elf32.c,v 1.94.12.5 2019/01/24 04:41:34 pgoyette Exp $ */ +/* $NetBSD: linux_exec_elf32.c,v 1.94.12.6 2019/01/24 04:52:58 pgoyette Exp $ */ /*- * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.5 2019/01/24 04:41:34 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.6 2019/01/24 04:52:58 pgoyette Exp $"); #ifndef ELFSIZE /* XXX should die */ @@ -73,7 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_e #include #include -#include #define LINUX_GO_RT0_SIGNATURE @@ -336,6 +335,7 @@ ELFNAME2(linux,go_rt0_signature)(struct goto out; #if (ELFSIZE == 32) + MODULE_HOOK(netbsd32_machine32_hook, const char *, (void)); extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook; MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); #else
CVS commit: [pgoyette-compat] src/sys/compat/linux/common
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:41:34 UTC 2019 Modified Files: src/sys/compat/linux/common [pgoyette-compat]: linux_exec_elf32.c Log Message: And include the definition To generate a diff of this commit: cvs rdiff -u -r1.94.12.4 -r1.94.12.5 \ src/sys/compat/linux/common/linux_exec_elf32.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/linux/common/linux_exec_elf32.c diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.4 src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.5 --- src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.4 Thu Jan 24 04:37:24 2019 +++ src/sys/compat/linux/common/linux_exec_elf32.c Thu Jan 24 04:41:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_elf32.c,v 1.94.12.4 2019/01/24 04:37:24 pgoyette Exp $ */ +/* $NetBSD: linux_exec_elf32.c,v 1.94.12.5 2019/01/24 04:41:34 pgoyette Exp $ */ /*- * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.4 2019/01/24 04:37:24 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.5 2019/01/24 04:41:34 pgoyette Exp $"); #ifndef ELFSIZE /* XXX should die */ @@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_e #include #include +#include #define LINUX_GO_RT0_SIGNATURE
CVS commit: [pgoyette-compat] src/sys/compat/linux/common
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:37:24 UTC 2019 Modified Files: src/sys/compat/linux/common [pgoyette-compat]: linux_exec_elf32.c Log Message: Make sure we declare the hook variable To generate a diff of this commit: cvs rdiff -u -r1.94.12.3 -r1.94.12.4 \ src/sys/compat/linux/common/linux_exec_elf32.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/linux/common/linux_exec_elf32.c diff -u src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.3 src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.4 --- src/sys/compat/linux/common/linux_exec_elf32.c:1.94.12.3 Thu Jan 24 04:08:09 2019 +++ src/sys/compat/linux/common/linux_exec_elf32.c Thu Jan 24 04:37:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_elf32.c,v 1.94.12.3 2019/01/24 04:08:09 pgoyette Exp $ */ +/* $NetBSD: linux_exec_elf32.c,v 1.94.12.4 2019/01/24 04:37:24 pgoyette Exp $ */ /*- * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.3 2019/01/24 04:08:09 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.94.12.4 2019/01/24 04:37:24 pgoyette Exp $"); #ifndef ELFSIZE /* XXX should die */ @@ -335,6 +335,7 @@ ELFNAME2(linux,go_rt0_signature)(struct goto out; #if (ELFSIZE == 32) + extern struct netbsd32_machine32_hook_t netbsd32_machine32_hook; MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); #else m = machine;
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:32:41 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: I must be getting tired - use the correct name of the hook To generate a diff of this commit: cvs rdiff -u -r1.38.2.4 -r1.38.2.5 src/sys/compat/netbsd32/netbsd32_sysctl.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/netbsd32/netbsd32_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.4 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.5 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.4 Thu Jan 24 04:31:19 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 04:32:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.5 2019/01/24 04:32:41 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -171,7 +171,7 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); - MODULE_CALL_HOOK(netbsd32_machine_32_hook, (), machine, m); + MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:31:19 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: I wrote this stuff, when will I ever learn to use MODULE_CALL_HOOK instead of MODULE_HOOK_CALL ? :) To generate a diff of this commit: cvs rdiff -u -r1.38.2.3 -r1.38.2.4 src/sys/compat/netbsd32/netbsd32_sysctl.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/netbsd32/netbsd32_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.3 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.4 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.3 Thu Jan 24 04:24:52 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 04:31:19 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.4 2019/01/24 04:31:19 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -171,7 +171,7 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); - MODULE_HOOK_CALL(netbsd32_machine_32_hook, (), machine, m); + MODULE_CALL_HOOK(netbsd32_machine_32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Jan 24 04:24:52 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_sysctl.c Log Message: Use the hook to get the value of machine32 To generate a diff of this commit: cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/compat/netbsd32/netbsd32_sysctl.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/netbsd32/netbsd32_sysctl.c diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.2 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.3 --- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.2 Thu Jan 24 03:41:48 2019 +++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 04:24:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.3 2019/01/24 04:24:52 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -171,6 +171,7 @@ netbsd32_sysctl_init(void) CTLTYPE_INT, "alignbytes", NULL, NULL, ALIGNBYTES32, NULL, 0, CTL_HW, HW_ALIGNBYTES, CTL_EOL); + MODULE_HOOK_CALL(netbsd32_machine_32_hook, (), machine, m); sysctl_createv(_clog, 0, &_root, NULL, CTLFLAG_PERMANENT, CTLTYPE_STRING, "machine", NULL,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Jan 24 04:16:03 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_exec_elf32.c
Log Message:
Use correct macro name
To generate a diff of this commit:
cvs rdiff -u -r1.40.14.1 -r1.40.14.2 \
src/sys/compat/netbsd32/netbsd32_exec_elf32.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/netbsd32/netbsd32_exec_elf32.c
diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.1 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.2
--- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.1 Thu Jan 24 03:41:48 2019
+++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Thu Jan 24 04:16:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $ */
+/* $NetBSD: netbsd32_exec_elf32.c,v 1.40.14.2 2019/01/24 04:16:03 pgoyette Exp $ */
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
/*
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40.14.2 2019/01/24 04:16:03 pgoyette Exp $");
#define ELFSIZE 32
@@ -112,7 +112,7 @@ ELFNAME2(netbsd32,probe_noteless)(struct
const char *m;
if (itp && epp->ep_interp == NULL) {
- MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m);
+ MODULE_CALL_HOOK(netbsd32_machine32_hook, (), machine, m);
(void)compat_elf_check_interp(epp, itp, m);
}
#ifdef _LP64
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Jan 24 03:41:48 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_exec_elf32.c
netbsd32_sysctl.c
Log Message:
Found a couple other consumers of machine32 - adapt them to use the hook
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.14.1 src/sys/compat/netbsd32/netbsd32_exec_elf32.c
cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/compat/netbsd32/netbsd32_sysctl.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/netbsd32/netbsd32_exec_elf32.c
diff -u src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40 src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40.14.1
--- src/sys/compat/netbsd32/netbsd32_exec_elf32.c:1.40 Sat Aug 6 15:13:13 2016
+++ src/sys/compat/netbsd32/netbsd32_exec_elf32.c Thu Jan 24 03:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_exec_elf32.c,v 1.40 2016/08/06 15:13:13 maxv Exp $ */
+/* $NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $ */
/* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */
/*
@@ -57,7 +57,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40 2016/08/06 15:13:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_elf32.c,v 1.40.14.1 2019/01/24 03:41:48 pgoyette Exp $");
#define ELFSIZE 32
@@ -72,6 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_exe
#include
#include
#include
+#include
#include
@@ -108,9 +109,11 @@ int
ELFNAME2(netbsd32,probe_noteless)(struct lwp *l, struct exec_package *epp,
void *eh, char *itp, vaddr_t *pos)
{
+ const char *m;
+
if (itp && epp->ep_interp == NULL) {
- extern const char machine32[];
- (void)compat_elf_check_interp(epp, itp, machine32);
+ MODULE_HOOK_CALL(netbsd32_machine32_hook, (), machine, m);
+ (void)compat_elf_check_interp(epp, itp, m);
}
#ifdef _LP64
epp->ep_flags |= EXEC_32 | EXEC_FORCEAUX;
Index: src/sys/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.1 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.2
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.38.2.1 Mon Jun 25 07:25:48 2018
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Thu Jan 24 03:41:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.1 2018/06/25 07:25:48 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.1 2018/06/25 07:25:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.38.2.2 2019/01/24 03:41:48 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#include
#include
#include
+#include
#include
@@ -122,7 +123,7 @@ void
netbsd32_sysctl_init(void)
{
const struct sysctlnode *_root = _sysctl_root;
- extern const char machine32[];
+ const char *m;
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
@@ -173,7 +174,7 @@ netbsd32_sysctl_init(void)
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRING, "machine", NULL,
- NULL, 0, __UNCONST(), 0,
+ NULL, 0, __UNCONST(m), 0,
CTL_HW, HW_MACHINE, CTL_EOL);
sysctl_createv(_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READONLY,
CVS commit: [pgoyette-compat] src/sys/compat/linux/common
Module Name:src Committed By: pgoyette Date: Thu Jan 24 02:05:16 UTC 2019 Modified Files: src/sys/compat/linux/common [pgoyette-compat]: linux_mod.c Log Message: Reduce the list of required modules to what is really needed To generate a diff of this commit: cvs rdiff -u -r1.10.2.3 -r1.10.2.4 src/sys/compat/linux/common/linux_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/linux/common/linux_mod.c diff -u src/sys/compat/linux/common/linux_mod.c:1.10.2.3 src/sys/compat/linux/common/linux_mod.c:1.10.2.4 --- src/sys/compat/linux/common/linux_mod.c:1.10.2.3 Thu Oct 18 22:09:56 2018 +++ src/sys/compat/linux/common/linux_mod.c Thu Jan 24 02:05:16 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_mod.c,v 1.10.2.3 2018/10/18 22:09:56 pgoyette Exp $ */ +/* $NetBSD: linux_mod.c,v 1.10.2.4 2019/01/24 02:05:16 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.3 2018/10/18 22:09:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.4 2019/01/24 02:05:16 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c, #endif #define REQ1"compat_ossaudio,sysv_ipc,compat_util" -#define REQ2",compat_12,compat_30,compat_50,compat_43,compat_sysv_50" +#define REQ2",compat_50,compat_43" MODULE(MODULE_CLASS_EXEC, compat_linux, REQ1 REQ2 MD1 MD2 MD3);
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Wed Jan 23 02:55:10 UTC 2019 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_raid_50.c Log Message: Add compat_raid_80 to the required list To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_raid_50.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/common/compat_raid_50.c diff -u src/sys/compat/common/compat_raid_50.c:1.1.2.1 src/sys/compat/common/compat_raid_50.c:1.1.2.2 --- src/sys/compat/common/compat_raid_50.c:1.1.2.1 Sat Sep 22 22:21:46 2018 +++ src/sys/compat/common/compat_raid_50.c Wed Jan 23 02:55:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_raid_50.c,v 1.1.2.1 2018/09/22 22:21:46 pgoyette Exp $ */ +/* $NetBSD: compat_raid_50.c,v 1.1.2.2 2019/01/23 02:55:09 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: compat_raid_50.c,v 1.1.2.1 2018/09/22 22:21:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_raid_50.c,v 1.1.2.2 2019/01/23 02:55:09 pgoyette Exp $"); #include #include @@ -64,7 +64,7 @@ int compat_raid_50_fini(void) return 0; } -MODULE(MODULE_CLASS_EXEC, compat_raid_50, "compat_50,raid"); +MODULE(MODULE_CLASS_EXEC, compat_raid_50, "compat_50,raid,compat_raid_80"); static int compat_50_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Jan 9 10:38:22 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen - otherwise compat_40_mount() is wrongly included in sysent.c
Missed this during earlier conflict resolution.
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.17 -r1.134.2.18 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.16 -r1.134.2.17 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.17 -r1.132.2.18 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.16 -r1.13.2.17 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.16 -r1.132.2.17 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.15 -r1.24.2.16 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.17 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.18
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.17 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Jan 9 10:38:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.17 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.18 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.16 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.17
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.16 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Jan 9 10:38:21 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.16 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.17 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.17 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.18
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.17 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Jan 9 10:38:21 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.17 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.18 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.17 2018/12/26 14:01:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.18 2019/01/09 10:38:21 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.16 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.17
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.16 Wed Dec 26 14:01:46 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Jan 9 10:38:21 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.16 2018/12/26 14:01:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.17 2019/01/09 10:38:21 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.124 2018/12/24 21:27:06 mrg Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.16 2018/12/26 14:01:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.17 2019/01/09 10:38:21 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
Index:
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Jan 5 02:49:16 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_conv.h
Log Message:
Fix typo in previous
To generate a diff of this commit:
cvs rdiff -u -r1.33.2.4 -r1.33.2.5 src/sys/compat/netbsd32/netbsd32_conv.h
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/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.4 src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.5
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.4 Thu Jan 3 10:57:32 2019
+++ src/sys/compat/netbsd32/netbsd32_conv.h Sat Jan 5 02:49:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.33.2.4 2019/01/03 10:57:32 pgoyette Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.33.2.5 2019/01/05 02:49:15 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -555,7 +555,7 @@ netbsd32_from_msqid_ds50(const struct ms
struct netbsd32_msqid_ds50 *ds32p)
{
- nemset(ds32p, 0, sizeof(*ds32p));
+ memset(ds32p, 0, sizeof(*ds32p));
netbsd32_from_ipc_perm(>msg_perm, >msg_perm);
ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes;
ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
CVS commit: [pgoyette-compat] src/sys/compat
Module Name:src
Committed By: pgoyette
Date: Thu Jan 3 10:57:32 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_14_sysv.c
netbsd32_conv.h
src/sys/compat/sys [pgoyette-compat]: msg.h
Log Message:
Bring in some more changes from HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c
cvs rdiff -u -r1.33.2.3 -r1.33.2.4 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/compat/sys/msg.h
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/netbsd32/netbsd32_compat_14_sysv.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.1.2.2
--- src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.1.2.1 Wed Sep 12 04:35:22 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c Thu Jan 3 10:57:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.1 2018/09/12 04:35:22 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.2 2019/01/03 10:57:32 pgoyette Exp $ */
/*
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.1 2018/09/12 04:35:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.2 2019/01/03 10:57:32 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -112,6 +112,7 @@ static inline void
native_to_netbsd32_msqid_ds14(struct msqid_ds *msqbuf, struct netbsd32_msqid_ds14 *omsqbuf)
{
+ memset(omsqbuf, 0, sizeof(*omsqbuf));
native_to_netbsd32_ipc_perm14(>msg_perm, >msg_perm);
#define CVT(x) omsqbuf->x = msqbuf->x
Index: src/sys/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.3 src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.4
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.3 Mon Nov 26 01:52:29 2018
+++ src/sys/compat/netbsd32/netbsd32_conv.h Thu Jan 3 10:57:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.33.2.3 2018/11/26 01:52:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.33.2.4 2019/01/03 10:57:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -555,6 +555,7 @@ netbsd32_from_msqid_ds50(const struct ms
struct netbsd32_msqid_ds50 *ds32p)
{
+ nemset(ds32p, 0, sizeof(*ds32p));
netbsd32_from_ipc_perm(>msg_perm, >msg_perm);
ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes;
ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
@@ -571,6 +572,7 @@ netbsd32_from_msqid_ds(const struct msqi
struct netbsd32_msqid_ds *ds32p)
{
+ memset(ds32p, 0, sizeof(*ds32p));
netbsd32_from_ipc_perm(>msg_perm, >msg_perm);
ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes;
ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
Index: src/sys/compat/sys/msg.h
diff -u src/sys/compat/sys/msg.h:1.4 src/sys/compat/sys/msg.h:1.4.64.1
--- src/sys/compat/sys/msg.h:1.4 Mon Jan 19 19:39:41 2009
+++ src/sys/compat/sys/msg.h Thu Jan 3 10:57:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.h,v 1.4 2009/01/19 19:39:41 christos Exp $ */
+/* $NetBSD: msg.h,v 1.4.64.1 2019/01/03 10:57:32 pgoyette Exp $ */
/*
* SVID compatible msg.h file
@@ -108,6 +108,7 @@ static __inline void
__native_to_msqid_ds13(const struct msqid_ds *msqbuf, struct msqid_ds13 *omsqbuf)
{
+ memset(omsqbuf, 0, sizeof(*omsqbuf));
omsqbuf->msg_perm = msqbuf->msg_perm;
#define CVT(x) omsqbuf->x = msqbuf->x
@@ -149,6 +150,7 @@ static __inline void
__native_to_msqid_ds14(const struct msqid_ds *msqbuf, struct msqid_ds14 *omsqbuf)
{
+ memset(omsqbuf, 0, sizeof(*omsqbuf));
__native_to_ipc_perm14(>msg_perm, >msg_perm);
#define CVT(x) omsqbuf->x = msqbuf->x
CVS commit: [pgoyette-compat] src/sys/compat
Module Name:src
Committed By: pgoyette
Date: Thu Oct 18 22:09:57 UTC 2018
Modified Files:
src/sys/compat/linux/common [pgoyette-compat]: linux_mod.c
src/sys/compat/sunos [pgoyette-compat]: sunos_mod.c
src/sys/compat/sunos32 [pgoyette-compat]: sunos32_mod.c
src/sys/compat/svr4 [pgoyette-compat]: svr4_mod.c
src/sys/compat/svr4_32 [pgoyette-compat]: svr4_32_mod.c
Log Message:
Add a few more references to the (currently always but not forever)
built-in compat_util module
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.3.28.1 -r1.3.28.2 src/sys/compat/sunos/sunos_mod.c
cvs rdiff -u -r1.3.28.1 -r1.3.28.2 src/sys/compat/sunos32/sunos32_mod.c
cvs rdiff -u -r1.4 -r1.4.28.1 src/sys/compat/svr4/svr4_mod.c
cvs rdiff -u -r1.3 -r1.3.28.1 src/sys/compat/svr4_32/svr4_32_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/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.10.2.2 src/sys/compat/linux/common/linux_mod.c:1.10.2.3
--- src/sys/compat/linux/common/linux_mod.c:1.10.2.2 Wed Sep 19 06:56:51 2018
+++ src/sys/compat/linux/common/linux_mod.c Thu Oct 18 22:09:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mod.c,v 1.10.2.2 2018/09/19 06:56:51 pgoyette Exp $ */
+/* $NetBSD: linux_mod.c,v 1.10.2.3 2018/10/18 22:09:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.2 2018/09/19 06:56:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.3 2018/10/18 22:09:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
# define MD3 ""
#endif
-#define REQ1"compat_ossaudio,sysv_ipc"
+#define REQ1"compat_ossaudio,sysv_ipc,compat_util"
#define REQ2",compat_12,compat_30,compat_50,compat_43,compat_sysv_50"
MODULE(MODULE_CLASS_EXEC, compat_linux, REQ1 REQ2 MD1 MD2 MD3);
Index: src/sys/compat/sunos/sunos_mod.c
diff -u src/sys/compat/sunos/sunos_mod.c:1.3.28.1 src/sys/compat/sunos/sunos_mod.c:1.3.28.2
--- src/sys/compat/sunos/sunos_mod.c:1.3.28.1 Tue Oct 2 01:43:53 2018
+++ src/sys/compat/sunos/sunos_mod.c Thu Oct 18 22:09:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_mod.c,v 1.3.28.1 2018/10/02 01:43:53 pgoyette Exp $ */
+/* $NetBSD: sunos_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_mod.c,v 1.3.28.1 2018/10/02 01:43:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $");
#include
#include
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunos_mod.c,
#include
-MODULE(MODULE_CLASS_EXEC, compat_sunos, "compat,exec_aout");
+MODULE(MODULE_CLASS_EXEC, compat_sunos, "compat,compat_util,exec_aout");
static struct execsw sunos_execsw = {
.es_hdrsz = SUNOS_AOUT_HDR_SIZE,
Index: src/sys/compat/sunos32/sunos32_mod.c
diff -u src/sys/compat/sunos32/sunos32_mod.c:1.3.28.1 src/sys/compat/sunos32/sunos32_mod.c:1.3.28.2
--- src/sys/compat/sunos32/sunos32_mod.c:1.3.28.1 Tue Oct 2 01:43:53 2018
+++ src/sys/compat/sunos32/sunos32_mod.c Thu Oct 18 22:09:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_mod.c,v 1.3.28.1 2018/10/02 01:43:53 pgoyette Exp $ */
+/* $NetBSD: sunos32_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos32_mod.c,v 1.3.28.1 2018/10/02 01:43:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_mod.c,v 1.3.28.2 2018/10/18 22:09:56 pgoyette Exp $");
#include
#include
@@ -45,7 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: sunos32_mod.
#include
-MODULE(MODULE_CLASS_EXEC, compat_sunos, "compat,compat_netbsd32,exec_aout");
+MODULE(MODULE_CLASS_EXEC, compat_sunos,
+"compat,compat_util,compat_netbsd32,exec_aout");
static struct execsw sunos_execsw = {
.es_hdrsz = SUNOS32_AOUT_HDR_SIZE,
Index: src/sys/compat/svr4/svr4_mod.c
diff -u src/sys/compat/svr4/svr4_mod.c:1.4 src/sys/compat/svr4/svr4_mod.c:1.4.28.1
--- src/sys/compat/svr4/svr4_mod.c:1.4 Fri Mar 7 08:40:59 2014
+++ src/sys/compat/svr4/svr4_mod.c Thu Oct 18 22:09:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_mod.c,v 1.4 2014/03/07 08:40:59 martin Exp $ */
+/* $NetBSD: svr4_mod.c,v 1.4.28.1 2018/10/18 22:09:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: svr4_mod.c,v 1.4 2014/03/07 08:40:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_mod.c,v 1.4.28.1 2018/10/18 22:09:56 pgoyette Exp $");
#ifndef ELFSIZE
#define ELFSIZE ARCH_ELFSIZE
@@ -55,7 +55,7 @@
CVS commit: [pgoyette-compat] src/sys/compat/osf1
Module Name:src Committed By: pgoyette Date: Thu Oct 18 22:04:23 UTC 2018 Modified Files: src/sys/compat/osf1 [pgoyette-compat]: osf1_mod.c Log Message: Add requirement for compat_util (even though it is currently built-in for all kernels) since there are references. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/compat/osf1/osf1_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/osf1/osf1_mod.c diff -u src/sys/compat/osf1/osf1_mod.c:1.5 src/sys/compat/osf1/osf1_mod.c:1.5.12.1 --- src/sys/compat/osf1/osf1_mod.c:1.5 Sun Feb 12 21:02:20 2017 +++ src/sys/compat/osf1/osf1_mod.c Thu Oct 18 22:04:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_mod.c,v 1.5 2017/02/12 21:02:20 chs Exp $ */ +/* $NetBSD: osf1_mod.c,v 1.5.12.1 2018/10/18 22:04:23 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: osf1_mod.c,v 1.5 2017/02/12 21:02:20 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_mod.c,v 1.5.12.1 2018/10/18 22:04:23 pgoyette Exp $"); #include #include @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_mod.c,v #include #include -MODULE(MODULE_CLASS_EXEC, compat_osf1, "compat,exec_ecoff"); +MODULE(MODULE_CLASS_EXEC, compat_osf1, "compat,compat_util,exec_ecoff"); #define OSF1_ARGLEN \ (OSF1_MAX_AUX_ENTRIES * sizeof (struct osf1_auxv) + \
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src
Committed By: pgoyette
Date: Wed Oct 3 21:52:02 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: if_43.c if_43.h
Log Message:
Don't define if_43_{init,fini}() in multiple .h files.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.8 -r1.14.2.9 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1.20.1 -r1.1.20.2 src/sys/compat/common/if_43.h
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/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.8 src/sys/compat/common/if_43.c:1.14.2.9
--- src/sys/compat/common/if_43.c:1.14.2.8 Wed Oct 3 21:27:14 2018
+++ src/sys/compat/common/if_43.c Wed Oct 3 21:52:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.8 2018/10/03 21:27:14 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.9 2018/10/03 21:52:02 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.8 2018/10/03 21:27:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.9 2018/10/03 21:52:02 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.
#include
#include
+#include
#include
#include
Index: src/sys/compat/common/if_43.h
diff -u src/sys/compat/common/if_43.h:1.1.20.1 src/sys/compat/common/if_43.h:1.1.20.2
--- src/sys/compat/common/if_43.h:1.1.20.1 Wed Oct 3 21:27:14 2018
+++ src/sys/compat/common/if_43.h Wed Oct 3 21:52:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.h,v 1.1.20.1 2018/10/03 21:27:14 pgoyette Exp $ */
+/* $NetBSD: if_43.h,v 1.1.20.2 2018/10/03 21:52:02 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -36,9 +36,6 @@
extern u_long (*vec_compat_cvtcmd)(u_long);
extern int (*vec_compat_ifioctl)(struct socket *, u_long, u_long,
void *, struct lwp *);
-
-int if_43_init(void);
-int if_43_fini(void);
#endif
#endif /* !_COMPAT_IF_43_H_ */
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src
Committed By: pgoyette
Date: Wed Oct 3 21:27:14 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: if_43.c if_43.h
Log Message:
Make if_43_{init,fini} return an int, for consistency with all the
related *_{init,fini} routines.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.7 -r1.14.2.8 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1 -r1.1.20.1 src/sys/compat/common/if_43.h
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/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14.2.7 src/sys/compat/common/if_43.c:1.14.2.8
--- src/sys/compat/common/if_43.c:1.14.2.7 Sun Sep 30 01:45:49 2018
+++ src/sys/compat/common/if_43.c Wed Oct 3 21:27:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.7 2018/09/30 01:45:49 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.8 2018/10/03 21:27:14 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.7 2018/09/30 01:45:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.8 2018/10/03 21:27:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -301,17 +301,19 @@ compat_ifioctl(struct socket *so, u_long
MODULE_SET_HOOK2(if_43_hook, "if_43", do_compat_cvtcmd, compat_ifioctl);
MODULE_UNSET_HOOK2(if_43_hook);
-void
+int
if_43_init(void)
{
if_43_hook_set();
+ return 0;
}
-void
+int
if_43_fini(void)
{
if_43_hook_unset();
+ return 0;
}
#endif /* defined(COMPAT_43) */
Index: src/sys/compat/common/if_43.h
diff -u src/sys/compat/common/if_43.h:1.1 src/sys/compat/common/if_43.h:1.1.20.1
--- src/sys/compat/common/if_43.h:1.1 Sat Nov 5 23:30:22 2016
+++ src/sys/compat/common/if_43.h Wed Oct 3 21:27:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.h,v 1.1 2016/11/05 23:30:22 pgoyette Exp $ */
+/* $NetBSD: if_43.h,v 1.1.20.1 2018/10/03 21:27:14 pgoyette Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -37,8 +37,8 @@ extern u_long (*vec_compat_cvtcmd)(u_lon
extern int (*vec_compat_ifioctl)(struct socket *, u_long, u_long,
void *, struct lwp *);
-void if_43_init(void);
-void if_43_fini(void);
+int if_43_init(void);
+int if_43_fini(void);
#endif
#endif /* !_COMPAT_IF_43_H_ */
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Oct 3 11:59:21 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_09.c
netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_16.c
netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_40.c
netbsd32_compat_50.c netbsd32_compat_60.c
Log Message:
Normalize the required lists. Each compat_netbsd32_xx needs the
non-32bit module of the same version _and_ the 32-bit module for
the next higher version.
To generate a diff of this commit:
cvs rdiff -u -r1.18.86.5 -r1.18.86.6 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.8 -r1.33.36.9 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.8 -r1.26.28.9 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/netbsd32/netbsd32_compat_16.c
cvs rdiff -u -r1.36.10.9 -r1.36.10.10 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.12 -r1.31.16.13 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_40.c
cvs rdiff -u -r1.32.16.11 -r1.32.16.12 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.8 -r1.3.2.9 src/sys/compat/netbsd32/netbsd32_compat_60.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/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.6
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5 Tue Sep 11 21:18:32 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.6 2018/10/03 11:59:21 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.6 2018/10/03 11:59:21 pgoyette Exp $");
#include
#include
@@ -100,7 +100,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_09, "compat_netbsd32,compat_09");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_09, "compat_netbsd32_12,compat_09");
static int
compat_netbsd32_09_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.8 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.9
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.8 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.9 2018/10/03 11:59:21 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.9 2018/10/03 11:59:21 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -229,8 +229,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12,
-"compat_netbsd32,compat_netbsd32_13,compat_12");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, "compat_netbsd32_13,compat_12");
static int
compat_netbsd32_12_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.8 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.9
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.8 Sat Sep 29 07:52:39 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.9 2018/10/03 11:59:21 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.9 2018/10/03 11:59:21 pgoyette Exp $");
#include
#include
@@ -104,8 +104,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13,
-"compat_netbsd32,compat_13,compat_netbsd32_16");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, "compat_13,compat_netbsd32_16");
static int
compat_netbsd32_13_modcmd(modcmd_t cmd, void *arg)
Index:
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Oct 3 07:03:17 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_12.c
netbsd32_compat_16.c netbsd32_compat_20.c netbsd32_compat_30.c
netbsd32_compat_40.c netbsd32_compat_50.c netbsd32_compat_60.c
Log Message:
Make sure that each version-specific compat_netbsd32_xx module depends
on all higher-version-specific modules, similar to the non-32bit
compat_xx modules.
To generate a diff of this commit:
cvs rdiff -u -r1.33.36.7 -r1.33.36.8 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_16.c
cvs rdiff -u -r1.36.10.8 -r1.36.10.9 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.11 -r1.31.16.12 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_40.c
cvs rdiff -u -r1.32.16.10 -r1.32.16.11 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.7 -r1.3.2.8 src/sys/compat/netbsd32/netbsd32_compat_60.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/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.8
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7 Tue Sep 11 21:18:32 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Wed Oct 3 07:03:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.8 2018/10/03 07:03:17 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -229,7 +229,8 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12, "compat_netbsd32,compat_12");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_12,
+"compat_netbsd32,compat_netbsd32_13,compat_12");
static int
compat_netbsd32_12_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_16.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.4
--- src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.3 Fri Sep 14 08:38:37 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Oct 3 07:03:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.3 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.4 2018/10/03 07:03:17 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.3 2018/09/14 08:38:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.4 2018/10/03 07:03:17 pgoyette Exp $");
#include
#include
@@ -53,7 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
struct uvm_object *emul_netbsd32_object;
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, "compat_netbsd32,compat_16");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16,
+"compat_netbsd32,compat_netbsd32_20,compat_16");
static int
compat_netbsd32_16_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_20.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.8 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.9
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.8 Tue Sep 11 21:18:32 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Wed Oct 3 07:03:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.8 2018/09/11 21:18:32 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.9 2018/10/03 07:03:17 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.8 2018/09/11 21:18:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.9 2018/10/03 07:03:17 pgoyette Exp $");
#include
#include
@@ -232,7 +232,8 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20, "compat_netbsd32,compat_20");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20,
+"compat_netbsd32,compat_netbsd32_30,compat_20");
static int
compat_netbsd32_20_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.11 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.12
---
CVS commit: [pgoyette-compat] src/sys/compat/sunos32
Module Name:src Committed By: pgoyette Date: Tue Oct 2 00:00:09 UTC 2018 Modified Files: src/sys/compat/sunos32 [pgoyette-compat]: files.sunos32 Log Message: Revert most of previous. Leave the original dependencies, but still remove the duplicate attribute definition to make config(1) happier. To generate a diff of this commit: cvs rdiff -u -r1.3.18.2 -r1.3.18.3 src/sys/compat/sunos32/files.sunos32 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/sunos32/files.sunos32 diff -u src/sys/compat/sunos32/files.sunos32:1.3.18.2 src/sys/compat/sunos32/files.sunos32:1.3.18.3 --- src/sys/compat/sunos32/files.sunos32:1.3.18.2 Sat Sep 22 03:31:40 2018 +++ src/sys/compat/sunos32/files.sunos32 Tue Oct 2 00:00:09 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.sunos32,v 1.3.18.2 2018/09/22 03:31:40 pgoyette Exp $ +# $NetBSD: files.sunos32,v 1.3.18.3 2018/10/02 00:00:09 pgoyette Exp $ # # Config file description for machine-independent SunOS compat code for # 64-bit kernel. Included by ports that need it. @@ -7,12 +7,11 @@ # own file lists. # XXX compat_sunos32 -define compat_sunos32 : compat_netbsd, compat_netbsd32, exec_aout -file compat/sunos32/sunos32_exec.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_exec_aout.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_misc.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_ioctl.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_sysent.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_mod.c compat_sunos32 & compat_netbsd32 -file compat/sunos32/sunos32_syscalls.c syscall_debug & - compat_sunos32 & compat_netbsd32 +#define compat_sunos +file compat/sunos32/sunos32_exec.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_exec_aout.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_misc.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_ioctl.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_sysent.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_mod.c compat_sunos & compat_netbsd32 +file compat/sunos32/sunos32_syscalls.c syscall_debug & compat_sunos & compat_netbsd32
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Sep 30 21:32:48 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: if43_20.c Log Message: atm is gone To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/if43_20.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/common/if43_20.c diff -u src/sys/compat/common/if43_20.c:1.1.2.3 src/sys/compat/common/if43_20.c:1.1.2.4 --- src/sys/compat/common/if43_20.c:1.1.2.3 Sat Sep 22 04:56:28 2018 +++ src/sys/compat/common/if43_20.c Sun Sep 30 21:32:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if43_20.c,v 1.1.2.3 2018/09/22 04:56:28 pgoyette Exp $ */ +/* $NetBSD: if43_20.c,v 1.1.2.4 2018/09/30 21:32:48 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.1.2.3 2018/09/22 04:56:28 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.1.2.4 2018/09/30 21:32:48 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: if43_20.c,v #include #include #include -#include #include #include
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 07:52:39 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_13.c
Log Message:
Make sure that the netbsd32_compat_16 code is available to compat_netbsd_13
To generate a diff of this commit:
cvs rdiff -u -r1.26.28.7 -r1.26.28.8 \
src/sys/compat/netbsd32/netbsd32_compat_13.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/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.7 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.8
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.7 Thu Sep 27 03:53:30 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Sat Sep 29 07:52:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.7 2018/09/27 03:53:30 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.7 2018/09/27 03:53:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.8 2018/09/29 07:52:39 pgoyette Exp $");
#include
#include
@@ -104,7 +104,8 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13, "compat_netbsd32,compat_13");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_13,
+"compat_netbsd32,compat_13,compat_netbsd32_16");
static int
compat_netbsd32_13_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:24:02 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.15 -r1.134.2.16 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.15 -r1.132.2.16 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.14 -r1.13.2.15 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.14 -r1.24.2.15 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.16
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:24:02 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.16 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -482,9 +482,13 @@
/* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
#define NETBSD32_SYS_netbsd32_ntp_adjtime 176
+#else
+/* 176 is excluded ntp_adjtime */
+#endif
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.15
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:24:02 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.15 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -913,11 +913,14 @@ struct compat_30_netbsd32_ntp_gettime_ar
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
};
check_syscall_args(compat_30_netbsd32_ntp_gettime)
+#if defined(NTP) || !defined(_KERNEL_OPT)
struct netbsd32_ntp_adjtime_args {
syscallarg(netbsd32_timexp_t) tp;
};
check_syscall_args(netbsd32_ntp_adjtime)
+#else
+#endif
struct netbsd32_setgid_args {
syscallarg(gid_t) gid;
@@ -2923,8 +2926,11 @@ int netbsd32_pwrite(struct lwp *, const
int compat_30_netbsd32_ntp_gettime(struct lwp *, const struct compat_30_netbsd32_ntp_gettime_args *, register_t *);
+#if defined(NTP) || !defined(_KERNEL_OPT)
int netbsd32_ntp_adjtime(struct lwp *, const struct netbsd32_ntp_adjtime_args *, register_t *);
+#else
+#endif
int netbsd32_setgid(struct lwp *, const struct netbsd32_setgid_args *, register_t *);
int netbsd32_setegid(struct lwp *, const struct netbsd32_setegid_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.16
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Sep 29 04:24:02 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.16 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.15
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:22:31 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Only keep the compat syscall entry; the main entry needs to remain
conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.18 -r1.120.2.19 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.18 src/sys/compat/netbsd32/syscalls.master:1.120.2.19
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.18 Sat Sep 29 04:11:06 2018
+++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:22:31 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -419,7 +419,11 @@
175 COMPAT_30 MODULAR compat_netbsd32_30 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
+#if defined(NTP) || !defined(_KERNEL_OPT)
176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); }
+#else
+176 EXCL ntp_adjtime
+#endif
177 UNIMPL
178 UNIMPL
179 UNIMPL
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:11:45 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.13 -r1.13.2.14 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.13 -r1.24.2.14 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:11:45 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -479,17 +479,12 @@
/* syscall: "netbsd32_pwrite" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_off_t" */
#define NETBSD32_SYS_netbsd32_pwrite 174
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175
/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
#define NETBSD32_SYS_netbsd32_ntp_adjtime 176
-#else
-/* 175 is excluded ntp_gettime */
-/* 176 is excluded ntp_adjtime */
-#endif
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
@@ -1032,13 +1027,9 @@
/* syscall: "compat_30_netbsd32___fhstat30" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_stat50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32___fhstat30 392
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32_ntp_gettime 393
-#else
-/* 393 is excluded __ntp_gettime30 */
-#endif
/* syscall: "netbsd32___socket30" ret: "int" args: "int" "int" "int" */
#define NETBSD32_SYS_netbsd32___socket30 394
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:11:45 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -908,7 +908,6 @@ struct netbsd32_pwrite_args {
syscallarg(netbsd32_off_t) offset;
};
check_syscall_args(netbsd32_pwrite)
-#if defined(NTP) || !defined(_KERNEL_OPT)
struct compat_30_netbsd32_ntp_gettime_args {
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
@@ -919,8 +918,6 @@ struct netbsd32_ntp_adjtime_args {
syscallarg(netbsd32_timexp_t) tp;
};
check_syscall_args(netbsd32_ntp_adjtime)
-#else
-#endif
struct netbsd32_setgid_args {
syscallarg(gid_t) gid;
@@ -2053,14 +2050,11 @@ struct compat_30_netbsd32___fhstat30_arg
syscallarg(netbsd32_stat50p_t) sb;
};
check_syscall_args(compat_30_netbsd32___fhstat30)
-#if defined(NTP) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32_ntp_gettime_args {
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
};
check_syscall_args(compat_50_netbsd32_ntp_gettime)
-#else
-#endif
struct netbsd32___socket30_args {
syscallarg(int) domain;
@@ -2927,13 +2921,10 @@ int netbsd32_pread(struct lwp *, const s
int netbsd32_pwrite(struct lwp *,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:11:07 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Don't #ifdef out the NTP compat calls.
The syscall number needs to be defined (for the autoload table) whether
or not the compat code is built in. The compat code will be included
in the module in all cases, but it makes explicit checks to ensure that
NTP code exists before executing.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.17 -r1.120.2.18 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.17 src/sys/compat/netbsd32/syscalls.master:1.120.2.18
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.17 Fri Sep 14 10:41:13 2018
+++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:11:06 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -416,15 +416,10 @@
174 STD { netbsd32_ssize_t|netbsd32||pwrite(int fd, \
netbsd32_voidp buf, netbsd32_size_t nbyte, \
int PAD, netbsd32_off_t offset); }
-#if defined(NTP) || !defined(_KERNEL_OPT)
175 COMPAT_30 MODULAR compat_netbsd32_30 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); }
-#else
-175 EXCL ntp_gettime
-176 EXCL ntp_adjtime
-#endif
177 UNIMPL
178 UNIMPL
179 UNIMPL
@@ -899,13 +894,9 @@
{ int|netbsd32|30|fhstat( \
netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t sb); }
-#if defined(NTP) || !defined(_KERNEL_OPT)
393 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
-#else
-393 EXCL __ntp_gettime30
-#endif
394 STD { int|netbsd32|30|socket(int domain, int type, \
int protocol); }
395 STD { int|netbsd32|30|getfh(netbsd32_charp fname, \
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:30:10 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: sunos_syscall.h
sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.96.2.2 -r1.96.2.3 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/sys/compat/sunos/sunos_syscallargs.h
cvs rdiff -u -r1.95.2.2 -r1.95.2.3 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.91.2.2 -r1.91.2.3 src/sys/compat/sunos/sunos_sysent.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/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.96.2.2 src/sys/compat/sunos/sunos_syscall.h:1.96.2.3
--- src/sys/compat/sunos/sunos_syscall.h:1.96.2.2 Sat Sep 29 02:06:46 2018
+++ src/sys/compat/sunos/sunos_syscall.h Sat Sep 29 02:30:09 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.96.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.96.2.3 2018/09/29 02:30:09 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALL_H_
@@ -402,19 +402,19 @@
/* syscall: "ustat" ret: "int" args: "int" "struct sunos_ustat *" */
#define SUNOS_SYS_ustat 168
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
/* syscall: "semsys" ret: "int" args: "int" "int" "int" "int" "int" */
#define SUNOS_SYS_semsys 169
#else
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
/* syscall: "msgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
#define SUNOS_SYS_msgsys 170
#else
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
/* syscall: "shmsys" ret: "int" args: "int" "int" "int" "int" */
#define SUNOS_SYS_shmsys 171
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.2 src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.3
--- src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.2 Sat Sep 29 02:06:46 2018
+++ src/sys/compat/sunos/sunos_syscallargs.h Sat Sep 29 02:30:09 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.80.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.80.2.3 2018/09/29 02:30:09 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -404,17 +404,17 @@ struct sunos_sys_ustat_args {
syscallarg(struct sunos_ustat *) buf;
};
check_syscall_args(sunos_sys_ustat)
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
struct compat_10_sys_semsys_args;
#else
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
struct compat_10_sys_msgsys_args;
#else
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
struct compat_10_sys_shmsys_args;
#else
@@ -716,17 +716,17 @@ int sunos_sys_mount(struct lwp *, const
int sunos_sys_ustat(struct lwp *, const struct sunos_sys_ustat_args *, register_t *);
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
int compat_10_sys_semsys(struct lwp *, const struct compat_10_sys_semsys_args *, register_t *);
#else
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
int compat_10_sys_msgsys(struct lwp *, const struct compat_10_sys_msgsys_args *, register_t *);
#else
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
int compat_10_sys_shmsys(struct lwp *, const struct compat_10_sys_shmsys_args *, register_t *);
#else
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.95.2.2 src/sys/compat/sunos/sunos_syscalls.c:1.95.2.3
--- src/sys/compat/sunos/sunos_syscalls.c:1.95.2.2 Sat Sep 29 02:06:46 2018
+++ src/sys/compat/sunos/sunos_syscalls.c Sat Sep 29 02:30:09 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.95.2.3 2018/09/29 02:30:09 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.3 2018/09/29 02:30:09 pgoyette Exp $");
#if
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:29:42 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize the compat_10 sysv ipc syscalls on both the COMPAT_10
and SYSVxxx attributes
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.1 -r1.80.2.2 src/sys/compat/sunos/syscalls.master
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/sunos/syscalls.master
diff -u src/sys/compat/sunos/syscalls.master:1.80.2.1 src/sys/compat/sunos/syscalls.master:1.80.2.2
--- src/sys/compat/sunos/syscalls.master:1.80.2.1 Sat Sep 29 02:06:14 2018
+++ src/sys/compat/sunos/syscalls.master Sat Sep 29 02:29:42 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -276,19 +276,19 @@
int flags, void *data); }
168 STD { int|sunos_sys||ustat(int dev, \
struct sunos_ustat *buf); }
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
169 NOARGS { int|compat_10_sys||semsys(int which, int a2, int a3, \
int a4, int a5); }
#else
169 UNIMPL semsys
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
170 NOARGS { int|compat_10_sys||msgsys(int which, int a2, int a3, \
int a4, int a5, int a6); }
#else
170 UNIMPL msgsys
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
171 NOARGS { int|compat_10_sys||shmsys(int which, int a2, int a3, \
int a4); }
#else
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:06:14 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize compat_09 syscalls
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.2.1 src/sys/compat/sunos/syscalls.master
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/sunos/syscalls.master
diff -u src/sys/compat/sunos/syscalls.master:1.80 src/sys/compat/sunos/syscalls.master:1.80.2.1
--- src/sys/compat/sunos/syscalls.master:1.80 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/sunos/syscalls.master Sat Sep 29 02:06:14 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -259,10 +259,15 @@
159 STD { int|sunos_sys||unmount(char *path); }
160 NOARGS { int|async||daemon(void); }
161 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
+#ifdef COMPAT_09
162 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
163 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
int len); }
+#else
+162 UNIMPL compat_09_sys_getdomainname
+163 UNIMPL compat_09_sys_setdomainname
+#endif
164 UNIMPL rtschedule
165 STD { int|sunos_sys||quotactl(int cmd, char *special, \
int uid, void *addr); }
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:06:46 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: sunos_syscall.h
sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.80.2.1 -r1.80.2.2 src/sys/compat/sunos/sunos_syscallargs.h
cvs rdiff -u -r1.95.2.1 -r1.95.2.2 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/compat/sunos/sunos_sysent.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/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.96.2.1 src/sys/compat/sunos/sunos_syscall.h:1.96.2.2
--- src/sys/compat/sunos/sunos_syscall.h:1.96.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/sunos/sunos_syscall.h Sat Sep 29 02:06:46 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.96.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.96.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALL_H_
@@ -381,12 +381,15 @@
/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
#define SUNOS_SYS_getfh 161
+#ifdef COMPAT_09
/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
#define SUNOS_SYS_getdomainname 162
/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
#define SUNOS_SYS_setdomainname 163
+#else
+#endif
/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */
#define SUNOS_SYS_quotactl 165
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.1 src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.2
--- src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/sunos/sunos_syscallargs.h Sat Sep 29 02:06:46 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.80.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.80.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -369,10 +369,13 @@ struct sunos_sys_unmount_args {
check_syscall_args(sunos_sys_unmount)
struct compat_30_sys_getfh_args;
+#ifdef COMPAT_09
struct compat_09_sys_getdomainname_args;
struct compat_09_sys_setdomainname_args;
+#else
+#endif
struct sunos_sys_quotactl_args {
syscallarg(int) cmd;
@@ -698,10 +701,13 @@ int async_daemon(struct lwp *, const voi
int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *);
+#ifdef COMPAT_09
int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *);
int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *);
+#else
+#endif
int sunos_sys_quotactl(struct lwp *, const struct sunos_sys_quotactl_args *, register_t *);
int sunos_sys_exportfs(struct lwp *, const struct sunos_sys_exportfs_args *, register_t *);
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.95.2.1 src/sys/compat/sunos/sunos_syscalls.c:1.95.2.2
--- src/sys/compat/sunos/sunos_syscalls.c:1.95.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/sunos/sunos_syscalls.c Sat Sep 29 02:06:46 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.95.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.1 2018/09/06 06:55:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -190,8 +190,13 @@ const char *const sunos_syscallnames[] =
/* 159 */ "unmount",
/* 160 */ "async_daemon",
/* 161 */ "getfh",
+#ifdef COMPAT_09
/* 162 */ "getdomainname",
/* 163 */ "setdomainname",
+#else
+ /* 162 */ "#162 (unimplemented compat_09_sys_getdomainname)",
+ /* 163 */ "#163 (unimplemented compat_09_sys_setdomainname)",
+#endif
/* 164 */ "#164
CVS commit: [pgoyette-compat] src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:45:32 UTC 2018
Modified Files:
src/sys/compat/ultrix [pgoyette-compat]: ultrix_syscall.h
ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.72.2.1 -r1.72.2.2 src/sys/compat/ultrix/ultrix_syscall.h
cvs rdiff -u -r1.67.2.1 -r1.67.2.2 src/sys/compat/ultrix/ultrix_syscallargs.h
cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/sys/compat/ultrix/ultrix_syscalls.c
cvs rdiff -u -r1.74.2.1 -r1.74.2.2 src/sys/compat/ultrix/ultrix_sysent.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/ultrix/ultrix_syscall.h
diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.72.2.1 src/sys/compat/ultrix/ultrix_syscall.h:1.72.2.2
--- src/sys/compat/ultrix/ultrix_syscall.h:1.72.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/ultrix/ultrix_syscall.h Sat Sep 29 01:45:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscall.h,v 1.72.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscall.h,v 1.72.2.2 2018/09/29 01:45:32 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALL_H_
@@ -387,12 +387,15 @@
/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
#define ULTRIX_SYS_getfh 164
+#if defined(COMPAT_09)
/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_getdomainname 165
/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_setdomainname 166
+#else
+#endif
/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */
#define ULTRIX_SYS_quotactl 168
Index: src/sys/compat/ultrix/ultrix_syscallargs.h
diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.67.2.1 src/sys/compat/ultrix/ultrix_syscallargs.h:1.67.2.2
--- src/sys/compat/ultrix/ultrix_syscallargs.h:1.67.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/ultrix/ultrix_syscallargs.h Sat Sep 29 01:45:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscallargs.h,v 1.67.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscallargs.h,v 1.67.2.2 2018/09/29 01:45:32 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALLARGS_H_
@@ -357,10 +357,13 @@ struct ultrix_sys_fstatfs_args {
check_syscall_args(ultrix_sys_fstatfs)
struct compat_30_sys_getfh_args;
+#if defined(COMPAT_09)
struct compat_09_sys_getdomainname_args;
struct compat_09_sys_setdomainname_args;
+#else
+#endif
struct ultrix_sys_quotactl_args {
syscallarg(int) cmd;
@@ -675,10 +678,13 @@ int ultrix_sys_fstatfs(struct lwp *, con
int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *);
+#if defined(COMPAT_09)
int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *);
int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *);
+#else
+#endif
int ultrix_sys_quotactl(struct lwp *, const struct ultrix_sys_quotactl_args *, register_t *);
int ultrix_sys_exportfs(struct lwp *, const struct ultrix_sys_exportfs_args *, register_t *);
Index: src/sys/compat/ultrix/ultrix_syscalls.c
diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.71.2.1 src/sys/compat/ultrix/ultrix_syscalls.c:1.71.2.2
--- src/sys/compat/ultrix/ultrix_syscalls.c:1.71.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/ultrix/ultrix_syscalls.c Sat Sep 29 01:45:32 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: ultrix_syscalls.c,v 1.71.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscalls.c,v 1.71.2.2 2018/09/29 01:45:32 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.71.2.1 2018/09/06 06:55:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.71.2.2 2018/09/29 01:45:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -193,8 +193,13 @@ const char *const ultrix_syscallnames[]
/* 162 */ "#162 (unimplemented umount)",
/* 163 */ "#163 (unimplemented async_daemon)",
/* 164 */ "getfh",
+#if defined(COMPAT_09)
/* 165 */ "getdomainname",
/* 166 */ "setdomainname",
+#else
+ /* 165 */ "#165 (unimplemented
CVS commit: [pgoyette-compat] src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:45:05 UTC 2018
Modified Files:
src/sys/compat/ultrix [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize compat_09_sys_{get,set}domainname syscalls appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/compat/ultrix/syscalls.master
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/ultrix/syscalls.master
diff -u src/sys/compat/ultrix/syscalls.master:1.56 src/sys/compat/ultrix/syscalls.master:1.56.2.1
--- src/sys/compat/ultrix/syscalls.master:1.56 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/ultrix/syscalls.master Sat Sep 29 01:45:05 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -255,10 +255,15 @@
162 UNIMPL umount
163 UNIMPL async_daemon
164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
+#if defined(COMPAT_09)
165 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
166 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
int len); }
+#else
+165 UNIMPL compat_09_sys_getdomainname
+166 UNIMPL compat_09_sys_setdomainname
+#endif
167 UNIMPL
168 STD { int|ultrix_sys||quotactl(int cmd, char *special, \
int uid, void *addr); }
CVS commit: [pgoyette-compat] src/sys/compat/aoutm68k
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:38:32 UTC 2018
Modified Files:
src/sys/compat/aoutm68k [pgoyette-compat]: aoutm68k_syscall.h
aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.52.2.1 -r1.52.2.2 src/sys/compat/aoutm68k/aoutm68k_syscall.h
cvs rdiff -u -r1.50.2.1 -r1.50.2.2 \
src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
cvs rdiff -u -r1.49.2.1 -r1.49.2.2 \
src/sys/compat/aoutm68k/aoutm68k_syscalls.c
cvs rdiff -u -r1.54.2.1 -r1.54.2.2 src/sys/compat/aoutm68k/aoutm68k_sysent.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/aoutm68k/aoutm68k_syscall.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52.2.1 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52.2.2
--- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52.2.1 Thu Sep 6 06:55:45 2018
+++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Sat Sep 29 01:38:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: aoutm68k_syscall.h,v 1.52.2.1 2018/09/06 06:55:45 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscall.h,v 1.52.2.2 2018/09/29 01:38:32 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
*/
#ifndef _AOUTM68K_SYS_SYSCALL_H_
@@ -352,9 +352,13 @@
/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
#define AOUTM68K_SYS_setpriority 96
+#if defined(COMPAT_30) || !defined(_KERNEL)
/* syscall: "socket" ret: "int" args: "int" "int" "int" */
#define AOUTM68K_SYS_socket 97
+#else
+/* 97 is excluded compat_30_sys_socket */
+#endif
/* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "int" */
#define AOUTM68K_SYS_connect 98
@@ -580,9 +584,13 @@
#else
/* 158 is excluded compat_20_sys_statfs */
#endif
+#if defined(COMPAT_30) || !defined(_KERNEL)
/* syscall: "getfh" ret: "int" args: "const char *" "struct compat_30_fhandle *" */
#define AOUTM68K_SYS_getfh 161
+#else
+/* 161 is excluded compat_30_sys_getfh */
+#endif
#if defined(COMPAT_09) || !defined(_KERNEL)
/* syscall: "ogetdomainname" ret: "int" args: "char *" "int" */
#define AOUTM68K_SYS_ogetdomainname 162
@@ -908,9 +916,13 @@
/* syscall: "fchroot" ret: "int" args: "int" */
#define AOUTM68K_SYS_fchroot 297
+#if defined(COMPAT_30) || ! defined(_KERNEL)
/* syscall: "fhopen" ret: "int" args: "const struct compat_30_fhandle *" "int" */
#define AOUTM68K_SYS_fhopen 298
+#else
+/* 298 is excluded compat_30_sys_fhopen */
+#endif
/* syscall: "fhstat" ret: "int" args: "const struct compat_30_fhandle *" "struct aoutm68k_stat *" */
#define AOUTM68K_SYS_fhstat 299
Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50.2.1 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50.2.2
--- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50.2.1 Thu Sep 6 06:55:45 2018
+++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Sat Sep 29 01:38:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: aoutm68k_syscallargs.h,v 1.50.2.1 2018/09/06 06:55:45 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscallargs.h,v 1.50.2.2 2018/09/29 01:38:32 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
*/
#ifndef _AOUTM68K_SYS_SYSCALLARGS_H_
@@ -239,8 +239,11 @@ struct compat_50_sys_select_args;
struct sys_fsync_args;
struct sys_setpriority_args;
+#if defined(COMPAT_30) || !defined(_KERNEL)
struct compat_30_sys_socket_args;
+#else
+#endif
struct sys_connect_args;
#if defined(COMPAT_43) || !defined(_KERNEL)
@@ -378,8 +381,11 @@ struct compat_20_sys_statfs_args;
struct compat_20_sys_fstatfs_args;
#else
#endif
+#if defined(COMPAT_30) || !defined(_KERNEL)
struct compat_30_sys_getfh_args;
+#else
+#endif
#if defined(COMPAT_09) || !defined(_KERNEL)
struct compat_09_sys_getdomainname_args;
@@ -611,8 +617,11 @@ struct compat_16_sys___sigreturn14_args;
struct sys___getcwd_args;
struct sys_fchroot_args;
+#if defined(COMPAT_30) || ! defined(_KERNEL)
struct compat_30_sys_fhopen_args;
+#else
+#endif
struct aoutm68k_sys_fhstat_args {
syscallarg(const struct compat_30_fhandle *) fhp;
@@ -874,8 +883,11 @@ int sys_fsync(struct lwp *, const struct
int sys_setpriority(struct lwp *, const struct sys_setpriority_args *, register_t *);
+#if defined(COMPAT_30) || !defined(_KERNEL)
int compat_30_sys_socket(struct lwp *, const struct compat_30_sys_socket_args *, register_t *);
+#else
+#endif
int sys_connect(struct lwp *, const struct
CVS commit: [pgoyette-compat] src/sys/compat/aoutm68k
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:37:26 UTC 2018
Modified Files:
src/sys/compat/aoutm68k [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize some compat_30 syscalls appropriately
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/compat/aoutm68k/syscalls.master
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/aoutm68k/syscalls.master
diff -u src/sys/compat/aoutm68k/syscalls.master:1.41 src/sys/compat/aoutm68k/syscalls.master:1.41.2.1
--- src/sys/compat/aoutm68k/syscalls.master:1.41 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/aoutm68k/syscalls.master Sat Sep 29 01:37:26 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -271,7 +271,11 @@
94 UNIMPL setdopt
95 NOARGS { int|sys||fsync(int fd); }
96 NOARGS { int|sys||setpriority(int which, int who, int prio); }
+#if defined(COMPAT_30) || !defined(_KERNEL)
97 NOARGS { int|compat_30_sys||socket(int domain, int type, int protocol); }
+#else
+97 EXCL compat_30_sys_socket
+#endif
98 NOARGS { int|sys||connect(int s, const struct sockaddr *name, \
int namelen); }
#if defined(COMPAT_43) || !defined(_KERNEL)
@@ -442,8 +446,12 @@
#endif
159 UNIMPL
160 UNIMPL
+#if defined(COMPAT_30) || !defined(_KERNEL)
161 NOARGS { int|compat_30_sys||getfh(const char *fname, \
struct compat_30_fhandle *fhp); }
+#else
+161 EXCL compat_30_sys_getfh
+#endif
#if defined(COMPAT_09) || !defined(_KERNEL)
162 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); } ogetdomainname
@@ -726,8 +734,12 @@
#endif
296 NOARGS { int|sys||__getcwd(char *bufp, size_t length); }
297 NOARGS { int|sys||fchroot(int fd); }
+#if defined(COMPAT_30) || ! defined(_KERNEL)
298 NOARGS { int|compat_30_sys||fhopen(const \
struct compat_30_fhandle *fhp, int flags); }
+#else
+298 EXCL compat_30_sys_fhopen
+#endif
299 STD { int|aoutm68k_sys||fhstat(const struct \
compat_30_fhandle *fhp, \
struct aoutm68k_stat *sb); }
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Fri Sep 28 08:42:01 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common Log Message: Use the correct attribute - compat_utils vs compat_util To generate a diff of this commit: cvs rdiff -u -r1.1.2.39 -r1.1.2.40 src/sys/compat/common/files.common 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/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.39 src/sys/compat/common/files.common:1.1.2.40 --- src/sys/compat/common/files.common:1.1.2.39 Fri Sep 28 08:08:56 2018 +++ src/sys/compat/common/files.common Fri Sep 28 08:42:01 2018 @@ -1,13 +1,11 @@ -# $NetBSD: files.common,v 1.1.2.39 2018/09/28 08:08:56 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.40 2018/09/28 08:42:01 pgoyette Exp $ # # Generic utility files, used by various compat options. # define compat_netbsd_util -file compat/common/compat_exec.c compat_30 | compat_09 | - compat_util -file compat/common/compat_util.c compat_30 | compat_09 | - compat_util +file compat/common/compat_exec.c compat_utils +file compat/common/compat_util.c compat_utils # # Sources for syscall and ioctl compatibility across the versions.
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Thu Sep 27 23:48:58 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common Log Message: Add dependencies to ensure that the utility routines get included as built-in module when needed. To generate a diff of this commit: cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/sys/compat/common/files.common 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/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.37 src/sys/compat/common/files.common:1.1.2.38 --- src/sys/compat/common/files.common:1.1.2.37 Sat Sep 22 10:30:53 2018 +++ src/sys/compat/common/files.common Thu Sep 27 23:48:58 2018 @@ -1,11 +1,11 @@ -# $NetBSD: files.common,v 1.1.2.37 2018/09/22 10:30:53 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.38 2018/09/27 23:48:58 pgoyette Exp $ # -# Generic files, used by all compat options. +# Generic utility files, used by various compat options. # -#file compat/common/compat_mod.c compat_netbsd -file compat/common/compat_exec.c compat_netbsd -file compat/common/compat_util.c compat_netbsd +define compat_netbsd_util +file compat/common/compat_exec.c compat_30 | compat_09 +file compat/common/compat_util.c compat_30 | compat_09 # # Sources for syscall and ioctl compatibility across the versions.
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 27 01:33:31 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_time.c Log Message: typo: insert missing ')' To generate a diff of this commit: cvs rdiff -u -r1.49.12.2 -r1.49.12.3 src/sys/compat/netbsd32/netbsd32_time.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/netbsd32/netbsd32_time.c diff -u src/sys/compat/netbsd32/netbsd32_time.c:1.49.12.2 src/sys/compat/netbsd32/netbsd32_time.c:1.49.12.3 --- src/sys/compat/netbsd32/netbsd32_time.c:1.49.12.2 Tue Sep 25 21:41:30 2018 +++ src/sys/compat/netbsd32/netbsd32_time.c Thu Sep 27 01:33:31 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_time.c,v 1.49.12.2 2018/09/25 21:41:30 pgoyette Exp $ */ +/* $NetBSD: netbsd32_time.c,v 1.49.12.3 2018/09/27 01:33:31 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49.12.2 2018/09/25 21:41:30 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.49.12.3 2018/09/27 01:33:31 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_ntp.h" @@ -45,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_tim #include #include #include +#include #include #include @@ -114,7 +115,7 @@ netbsd32_ntp_adjtime(struct lwp *l, cons NULL))) return (error); - (*vec_ntp_adjtime1(); + (*vec_ntp_adjtime1)(); netbsd32_from_timex(, ); error = copyout(, SCARG_P32(uap, tp), sizeof(ntv32));
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Mon Sep 24 23:06:02 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: syntax: add missing ) To generate a diff of this commit: cvs rdiff -u -r1.116.2.13 -r1.116.2.14 src/sys/compat/netbsd32/netbsd32.h 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/netbsd32/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.13 src/sys/compat/netbsd32/netbsd32.h:1.116.2.14 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.13 Mon Sep 24 22:56:45 2018 +++ src/sys/compat/netbsd32/netbsd32.h Mon Sep 24 23:06:02 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.13 2018/09/24 22:56:45 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.14 2018/09/24 23:06:02 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1167,7 +1167,7 @@ struct iovec *netbsd32_get_iov(struct ne SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup); #endif /* SYSCTL_SETUP_PROTO */ -MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *); +MODULE_HOOK(netbsd32_sendsig_hook, (const ksiginfo_t *, const sigset_t *)); extern struct sysent netbsd32_sysent[]; extern const uint32_t netbsd32_sysent_nomodbits[];
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 21:43:46 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
netbsd32_mod.c
Log Message:
Use a .h file to define the xxx_{init,fini} routines, and include
the compat_stub.h header to get the definition of the kern_proc_32
hook.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.13.16.15 -r1.13.16.16 src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.4
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.1.2.3 Sun Sep 23 11:50:03 2018
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Sun Sep 23 21:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.3 2018/09/23 11:50:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.1.2.4 2018/09/23 21:43:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -100,11 +100,13 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ker
#include
#include
#include
+#include
#include
#include
#include
+#include
static int
copyin_psstrings_32(struct proc *p, struct ps_strings *arginfo)
@@ -141,7 +143,7 @@ MODULE_UNSET_HOOK2(kern_proc_32_hook);
#endif
void
-kern_proc_32_init(void)
+netbsd32_kern_proc_32_init(void)
{
#if !defined(_RUMPSERVER)
@@ -150,7 +152,7 @@ kern_proc_32_init(void)
}
void
-kern_proc_32_fini(void)
+netbsd32_kern_proc_32_fini(void)
{
#if !defined(_RUMPSERVER)
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.16
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 Sun Sep 23 11:29:53 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 21:43:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.16 2018/09/23 21:43:45 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -112,19 +112,19 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi
if (error == 0) {
netbsd32_sysctl_init();
netbsd32_machdep_md_init();
- kern_proc_32_init();
+ netbsd32_kern_proc_32_init();
}
return error;
case MODULE_CMD_FINI:
netbsd32_machdep_md_fini();
netbsd32_sysctl_fini();
- kern_proc_32_fini();
+ netbsd32_kern_proc_32_fini();
error = exec_remove(netbsd32_execsw,
__arraycount(netbsd32_execsw));
if (error) {
- kern_proc_32_init();
+ netbsd32_kern_proc_32_init();
netbsd32_sysctl_init();
netbsd32_machdep_md_init();
}
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 11:57:10 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
Log Message:
The kern_proc_32 hook is defined in non-compat code. Don't redefine.
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.11 -r1.116.2.12 src/sys/compat/netbsd32/netbsd32.h
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/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.11 src/sys/compat/netbsd32/netbsd32.h:1.116.2.12
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.11 Sun Sep 23 11:23:47 2018
+++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 11:57:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.11 2018/09/23 11:23:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.12 2018/09/23 11:57:09 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1181,13 +1181,6 @@ struct netbsd32_modctl_args;
MODULE_HOOK(compat32_80_modctl_hook,
(struct lwp *, const struct netbsd32_modctl_args *, register_t *));
-/*
- * kern_proc compatability for netbsd32
- */
-struct ps_strings;
-MODULE_HOOK2(kern_proc_32_hook, (struct proc *, struct ps_strings *),
-(char **, size_t, vaddr_t *));
-
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
* places when calling syscall_{,dis}establish()
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 11:29:53 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: The kern_proc_32 hook is in the main kernel, so don't make another one here. To generate a diff of this commit: cvs rdiff -u -r1.13.16.14 -r1.13.16.15 src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.15 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.14 Sun Sep 23 11:23:47 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Sun Sep 23 11:29:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.14 2018/09/23 11:23:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.15 2018/09/23 11:29:53 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1)) struct compat32_80_modctl_hook_t compat32_80_modctl_hook; -struct kern_proc_32_hook_t kern_proc_32_hook; # define DEPS1 "ksem,coredump,compat_util"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 09:16:25 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_50.c
Log Message:
Be selective about including the NTP syscall ntp_gettime
To generate a diff of this commit:
cvs rdiff -u -r1.32.16.8 -r1.32.16.9 \
src/sys/compat/netbsd32/netbsd32_compat_50.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/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.8 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.9
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.8 Tue Sep 11 23:58:46 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Sun Sep 23 09:16:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.8 2018/09/11 23:58:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.9 2018/09/23 09:16:25 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.8 2018/09/11 23:58:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.9 2018/09/23 09:16:25 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -931,6 +931,7 @@ compat_50_netbsd32_quotactl(struct lwp *
return (compat_50_sys_quotactl(l, , retval));
}
+#ifdef NTP
int
compat_50_netbsd32_ntp_gettime(struct lwp *l,
const struct compat_50_netbsd32_ntp_gettime_args *uap, register_t *retval)
@@ -959,7 +960,7 @@ compat_50_netbsd32_ntp_gettime(struct lw
return (error);
}
-
+#endif
static struct syscall_package compat_netbsd32_50_syscalls[] = {
{ NETBSD32_SYS_compat_50_netbsd32_mknod, 0,
@@ -1018,8 +1019,10 @@ static struct syscall_package compat_net
(sy_call_t *)compat_50_netbsd32_getitimer },
{ NETBSD32_SYS_compat_50_netbsd32_quotactl, 0,
(sy_call_t *)compat_50_netbsd32_quotactl },
+#ifdef NTP
{ NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, 0,
(sy_call_t *)compat_50_netbsd32_ntp_gettime },
+#endif
{ 0, 0, NULL }
};
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Sun Sep 23 09:16:49 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: White space for readability To generate a diff of this commit: cvs rdiff -u -r1.116.2.9 -r1.116.2.10 src/sys/compat/netbsd32/netbsd32.h 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/netbsd32/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.9 src/sys/compat/netbsd32/netbsd32.h:1.116.2.10 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.9 Tue Sep 18 23:03:54 2018 +++ src/sys/compat/netbsd32/netbsd32.h Sun Sep 23 09:16:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.9 2018/09/18 23:03:54 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.10 2018/09/23 09:16:49 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -47,6 +47,7 @@ #include #include #include + #include #include #include
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 08:02:50 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c
Log Message:
Revert previous. Instead, don't put an entry for ntp_gettime in the
syscall package if we don't have NTP.
To generate a diff of this commit:
cvs rdiff -u -r1.31.16.9 -r1.31.16.10 \
src/sys/compat/netbsd32/netbsd32_compat_30.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/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.10
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9 Sun Sep 23 08:01:13 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Sun Sep 23 08:02:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.10 2018/09/23 08:02:50 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -301,10 +301,10 @@ compat_30_netbsd32_fhopen(struct lwp *l,
return (compat_30_sys_fhopen(l, , retval));
}
+#ifdef NTP
int
compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval)
{
-#ifdef NTP
/* {
syscallarg(netbsd32_ntptimevalp_t) ntvp;
} */
@@ -326,11 +326,8 @@ compat_30_netbsd32_ntp_gettime(struct lw
}
return (error);
-#else
-
- return ENOSYS;
-#endif
}
+#endif
static struct syscall_package compat_netbsd32_30_syscalls[] = {
{ NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
@@ -353,8 +350,10 @@ static struct syscall_package compat_net
(sy_call_t *)compat_30_netbsd32___fhstat30 },
{ NETBSD32_SYS_compat_30_netbsd32_fhopen, 0,
(sy_call_t *)compat_30_netbsd32_fhopen },
+#ifdef NTP
{ NETBSD32_SYS_compat_30_netbsd32_ntp_gettime, 0,
(sy_call_t *)compat_30_netbsd32_ntp_gettime },
+#endif
{ 0, 0, NULL }
};
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sun Sep 23 08:01:13 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_30.c
Log Message:
Provide a dummy version of netbsd32_ntp_gettime for systems where NTP
isn't defined.
To generate a diff of this commit:
cvs rdiff -u -r1.31.16.8 -r1.31.16.9 \
src/sys/compat/netbsd32/netbsd32_compat_30.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/netbsd32/netbsd32_compat_30.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.8 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.9
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.8 Tue Sep 11 23:58:46 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Sun Sep 23 08:01:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.8 2018/09/11 23:58:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.8 2018/09/11 23:58:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.9 2018/09/23 08:01:13 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -301,10 +301,10 @@ compat_30_netbsd32_fhopen(struct lwp *l,
return (compat_30_sys_fhopen(l, , retval));
}
-#ifdef NTP
int
compat_30_netbsd32_ntp_gettime(struct lwp *l, const struct compat_30_netbsd32_ntp_gettime_args *uap, register_t *retval)
{
+#ifdef NTP
/* {
syscallarg(netbsd32_ntptimevalp_t) ntvp;
} */
@@ -326,8 +326,11 @@ compat_30_netbsd32_ntp_gettime(struct lw
}
return (error);
-}
+#else
+
+ return ENOSYS;
#endif
+}
static struct syscall_package compat_netbsd32_30_syscalls[] = {
{ NETBSD32_SYS_compat_30_netbsd32_getdents, 0,
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Sep 23 07:39:43 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: usb_subr_30.c Log Message: Don't try to include usb_verbose.h - it might not exist on platforms that don't have USB! It turns out that nothing uses it any. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/usb_subr_30.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/common/usb_subr_30.c diff -u src/sys/compat/common/usb_subr_30.c:1.1.2.3 src/sys/compat/common/usb_subr_30.c:1.1.2.4 --- src/sys/compat/common/usb_subr_30.c:1.1.2.3 Tue Sep 18 23:03:54 2018 +++ src/sys/compat/common/usb_subr_30.c Sun Sep 23 07:39:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $ */ +/* $NetBSD: usb_subr_30.c,v 1.1.2.4 2018/09/23 07:39:43 pgoyette Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -32,12 +32,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.3 2018/09/18 23:03:54 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.1.2.4 2018/09/23 07:39:43 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #include "opt_usb.h" -#include "opt_usbverbose.h" #endif #include
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Sep 23 04:27:49 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_50_mod.c Log Message: Now that cryptodev_50 is a separate module we can't initialize it from the generic compat_50 module. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/sys/compat/common/compat_50_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/common/compat_50_mod.c diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.14 src/sys/compat/common/compat_50_mod.c:1.1.2.15 --- src/sys/compat/common/compat_50_mod.c:1.1.2.14 Sat Sep 22 22:21:46 2018 +++ src/sys/compat/common/compat_50_mod.c Sun Sep 23 04:27:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_50_mod.c,v 1.1.2.14 2018/09/22 22:21:46 pgoyette Exp $ */ +/* $NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.14 2018/09/22 22:21:46 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.15 2018/09/23 04:27:48 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -84,7 +84,6 @@ compat_50_init(void) uipc_syscalls_50_init(); clockctl_50_init(); if_spppsubr_50_init(); - cryptodev_50_init(); puffs_50_init(); wsevent_50_init(); vnd_50_init(); @@ -111,7 +110,6 @@ compat_50_fini(void) vnd_50_fini(); wsevent_50_fini(); puffs_50_fini(); - cryptodev_50_fini(); if_spppsubr_50_fini(); clockctl_50_fini(); uipc_syscalls_50_fini(); @@ -147,7 +145,6 @@ compat_50_fini(void) uipc_syscalls_50_init(); clockctl_50_init(); if_spppsubr_50_init(); - cryptodev_50_init(); puffs_50_init(); wsevent_50_init(); vnd_50_init();
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sat Sep 22 10:30:53 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common Log Message: Missed this in previous files.* changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.36 -r1.1.2.37 src/sys/compat/common/files.common 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/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.36 src/sys/compat/common/files.common:1.1.2.37 --- src/sys/compat/common/files.common:1.1.2.36 Wed Sep 19 04:12:43 2018 +++ src/sys/compat/common/files.common Sat Sep 22 10:30:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.common,v 1.1.2.36 2018/09/19 04:12:43 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.37 2018/09/22 10:30:53 pgoyette Exp $ # # Generic files, used by all compat options. @@ -82,8 +82,8 @@ file compat/common/rtsock_50.c compat_5 file compat/common/vfs_syscalls_50.c compat_50 file compat/common/uipc_syscalls_50.c compat_50 file compat/common/vnd_50.c compat_50 -file compat/common/clockctl_50.c compat_50 & clockctl -file compat/common/if_spppsubr50.c compat_50 & sppp +file compat/common/clockctl_50.c compat_50 +file compat/common/if_spppsubr50.c compat_50 file compat/common/uvm_50.c compat_50 # Compatibility code for NetBSD 6.0 @@ -92,7 +92,7 @@ file compat/common/kern_sa_60.c compat_ file compat/common/tty_60.c compat_60 file compat/common/kern_time_60.c compat_60 file compat/common/kern_cpu_60.c compat_60 -file compat/common/ccd_60.c compat_60 & ccd +file compat/common/ccd_60.c compat_60 # Compatibility code for NetBSD 7.0 file compat/common/compat_70_mod.c compat_70
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sat Sep 22 04:56:28 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: bio_30.c clockctl_50.c compat_09_mod.c compat_10_mod.c compat_12_mod.c compat_13_mod.c compat_14_mod.c compat_16_mod.c compat_20_mod.c compat_30_mod.c compat_40_mod.c compat_43_mod.c compat_50_mod.c compat_60_mod.c compat_70_mod.c compat_80_mod.c compat_exec.c compat_util.c if43_20.c kern_50.c kern_exit_43.c kern_info_09.c kern_info_43.c kern_ipc_10.c kern_mod_80.c kern_resource_43.c kern_sa_60.c kern_select_50.c kern_sig_13.c kern_sig_16.c kern_time_30.c kern_time_50.c kern_time_60.c kern_xxx_12.c rtsock_14.c sysmon_power_40.c sysv_msg_14.c sysv_msg_50.c sysv_sem_14.c sysv_sem_50.c sysv_shm_14.c sysv_shm_50.c tty_43.c uipc_syscalls_30.c uipc_syscalls_40.c uipc_syscalls_43.c uipc_syscalls_50.c uipc_usrreq_70.c uvm_13.c uvm_50.c vfs_syscalls_10.c vfs_syscalls_12.c vfs_syscalls_30.c vfs_syscalls_40.c vfs_syscalls_50.c vm_12.c vm_43.c vnd_30.c vnd_50.c Log Message: #include "opt_compat_netbsd.h" for all sources that provide compat code. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/bio_30.c \ src/sys/compat/common/clockctl_50.c src/sys/compat/common/compat_43_mod.c \ src/sys/compat/common/sysmon_power_40.c src/sys/compat/common/vnd_30.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/compat_09_mod.c \ src/sys/compat/common/compat_10_mod.c \ src/sys/compat/common/compat_14_mod.c \ src/sys/compat/common/compat_16_mod.c \ src/sys/compat/common/compat_20_mod.c cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/compat_12_mod.c \ src/sys/compat/common/compat_13_mod.c \ src/sys/compat/common/compat_40_mod.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/compat_30_mod.c cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/sys/compat/common/compat_50_mod.c cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/sys/compat/common/compat_60_mod.c cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/compat/common/compat_70_mod.c \ src/sys/compat/common/compat_80_mod.c cvs rdiff -u -r1.17 -r1.17.62.1 src/sys/compat/common/compat_exec.c cvs rdiff -u -r1.46.18.3 -r1.46.18.4 src/sys/compat/common/compat_util.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/if43_20.c \ src/sys/compat/common/uvm_13.c src/sys/compat/common/uvm_50.c \ src/sys/compat/common/vfs_syscalls_10.c cvs rdiff -u -r1.1.34.1 -r1.1.34.2 src/sys/compat/common/kern_50.c cvs rdiff -u -r1.22.62.1 -r1.22.62.2 src/sys/compat/common/kern_exit_43.c cvs rdiff -u -r1.20.96.1 -r1.20.96.2 src/sys/compat/common/kern_info_09.c cvs rdiff -u -r1.35.28.2 -r1.35.28.3 src/sys/compat/common/kern_info_43.c cvs rdiff -u -r1.25 -r1.25.64.1 src/sys/compat/common/kern_ipc_10.c cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/common/kern_mod_80.c cvs rdiff -u -r1.21.96.1 -r1.21.96.2 src/sys/compat/common/kern_resource_43.c cvs rdiff -u -r1.1.42.3 -r1.1.42.4 src/sys/compat/common/kern_sa_60.c cvs rdiff -u -r1.1.60.1 -r1.1.60.2 src/sys/compat/common/kern_select_50.c cvs rdiff -u -r1.20.56.1 -r1.20.56.2 src/sys/compat/common/kern_sig_13.c \ src/sys/compat/common/vm_12.c cvs rdiff -u -r1.2.38.3 -r1.2.38.4 src/sys/compat/common/kern_sig_16.c cvs rdiff -u -r1.5.14.1 -r1.5.14.2 src/sys/compat/common/kern_time_30.c cvs rdiff -u -r1.31.16.3 -r1.31.16.4 src/sys/compat/common/kern_time_50.c cvs rdiff -u -r1.1.38.1 -r1.1.38.2 src/sys/compat/common/kern_time_60.c cvs rdiff -u -r1.15.56.1 -r1.15.56.2 src/sys/compat/common/kern_xxx_12.c cvs rdiff -u -r1.5.14.3 -r1.5.14.4 src/sys/compat/common/rtsock_14.c cvs rdiff -u -r1.19 -r1.19.56.1 src/sys/compat/common/sysv_msg_14.c cvs rdiff -u -r1.3 -r1.3.56.1 src/sys/compat/common/sysv_msg_50.c \ src/sys/compat/common/sysv_sem_50.c src/sys/compat/common/sysv_shm_50.c cvs rdiff -u -r1.16 -r1.16.56.1 src/sys/compat/common/sysv_sem_14.c cvs rdiff -u -r1.17 -r1.17.56.1 src/sys/compat/common/sysv_shm_14.c cvs rdiff -u -r1.30.26.1 -r1.30.26.2 src/sys/compat/common/tty_43.c cvs rdiff -u -r1.3.96.1 -r1.3.96.2 src/sys/compat/common/uipc_syscalls_30.c cvs rdiff -u -r1.15.2.10 -r1.15.2.11 src/sys/compat/common/uipc_syscalls_40.c cvs rdiff -u -r1.47.14.5 -r1.47.14.6 src/sys/compat/common/uipc_syscalls_43.c cvs rdiff -u -r1.3.56.9 -r1.3.56.10 src/sys/compat/common/uipc_syscalls_50.c cvs rdiff -u -r1.1.20.1 -r1.1.20.2 src/sys/compat/common/uipc_usrreq_70.c cvs rdiff -u -r1.35.2.2 -r1.35.2.3 src/sys/compat/common/vfs_syscalls_12.c cvs rdiff -u -r1.36.18.2 -r1.36.18.3 src/sys/compat/common/vfs_syscalls_30.c cvs rdiff -u -r1.4.16.1 -r1.4.16.2 src/sys/compat/common/vfs_syscalls_40.c cvs rdiff -u -r1.18.18.1 -r1.18.18.2 src/sys/compat/common/vfs_syscalls_50.c cvs rdiff -u -r1.20.8.1 -r1.20.8.2 src/sys/compat/common/vm_43.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2
CVS commit: [pgoyette-compat] src/sys/compat/sunos32
Module Name:src Committed By: pgoyette Date: Sat Sep 22 03:31:40 UTC 2018 Modified Files: src/sys/compat/sunos32 [pgoyette-compat]: files.sunos32 Log Message: Use attribute compat_sunos32 rather than duplicating compat_sunos (config(1) doesn't like duplication) To generate a diff of this commit: cvs rdiff -u -r1.3.18.1 -r1.3.18.2 src/sys/compat/sunos32/files.sunos32 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/sunos32/files.sunos32 diff -u src/sys/compat/sunos32/files.sunos32:1.3.18.1 src/sys/compat/sunos32/files.sunos32:1.3.18.2 --- src/sys/compat/sunos32/files.sunos32:1.3.18.1 Mon Mar 12 01:59:32 2018 +++ src/sys/compat/sunos32/files.sunos32 Sat Sep 22 03:31:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.sunos32,v 1.3.18.1 2018/03/12 01:59:32 pgoyette Exp $ +# $NetBSD: files.sunos32,v 1.3.18.2 2018/09/22 03:31:40 pgoyette Exp $ # # Config file description for machine-independent SunOS compat code for # 64-bit kernel. Included by ports that need it. @@ -7,11 +7,12 @@ # own file lists. # XXX compat_sunos32 -define compat_sunos : compat_netbsd, compat_netbsd32, exec_aout -file compat/sunos32/sunos32_exec.c compat_sunos & compat_netbsd32 -file compat/sunos32/sunos32_exec_aout.c compat_sunos & compat_netbsd32 -file compat/sunos32/sunos32_misc.c compat_sunos & compat_netbsd32 -file compat/sunos32/sunos32_ioctl.c compat_sunos & compat_netbsd32 -file compat/sunos32/sunos32_sysent.c compat_sunos & compat_netbsd32 -file compat/sunos32/sunos32_mod.c compat_sunos & compat_netbsd32 -file compat/sunos32/sunos32_syscalls.c syscall_debug & compat_sunos & compat_netbsd32 +define compat_sunos32 : compat_netbsd, compat_netbsd32, exec_aout +file compat/sunos32/sunos32_exec.c compat_sunos32 & compat_netbsd32 +file compat/sunos32/sunos32_exec_aout.c compat_sunos32 & compat_netbsd32 +file compat/sunos32/sunos32_misc.c compat_sunos32 & compat_netbsd32 +file compat/sunos32/sunos32_ioctl.c compat_sunos32 & compat_netbsd32 +file compat/sunos32/sunos32_sysent.c compat_sunos32 & compat_netbsd32 +file compat/sunos32/sunos32_mod.c compat_sunos32 & compat_netbsd32 +file compat/sunos32/sunos32_syscalls.c syscall_debug & + compat_sunos32 & compat_netbsd32
CVS commit: [pgoyette-compat] src/sys/compat/linux/common
Module Name:src Committed By: pgoyette Date: Wed Sep 19 06:56:51 UTC 2018 Modified Files: src/sys/compat/linux/common [pgoyette-compat]: linux_mod.c Log Message: Remove leading coma from list of required modules. It doesn't seem to cause any real problems, but it makes modstat output look weird. To generate a diff of this commit: cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/sys/compat/linux/common/linux_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/linux/common/linux_mod.c diff -u src/sys/compat/linux/common/linux_mod.c:1.10.2.1 src/sys/compat/linux/common/linux_mod.c:1.10.2.2 --- src/sys/compat/linux/common/linux_mod.c:1.10.2.1 Wed Sep 12 07:45:56 2018 +++ src/sys/compat/linux/common/linux_mod.c Wed Sep 19 06:56:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $ */ +/* $NetBSD: linux_mod.c,v 1.10.2.2 2018/09/19 06:56:51 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.2 2018/09/19 06:56:51 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c, # define MD3 "" #endif -#define REQ1",compat_ossaudio,sysv_ipc" +#define REQ1"compat_ossaudio,sysv_ipc" #define REQ2",compat_12,compat_30,compat_50,compat_43,compat_sysv_50" MODULE(MODULE_CLASS_EXEC, compat_linux, REQ1 REQ2 MD1 MD2 MD3);
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Wed Sep 19 06:37:11 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_30_mod.c Log Message: We have some COMPAT_30 code that needs compat_offseterr(), so let's require the compat_util module. To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/compat/common/compat_30_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/common/compat_30_mod.c diff -u src/sys/compat/common/compat_30_mod.c:1.1.2.7 src/sys/compat/common/compat_30_mod.c:1.1.2.8 --- src/sys/compat/common/compat_30_mod.c:1.1.2.7 Sat Sep 15 02:14:39 2018 +++ src/sys/compat/common/compat_30_mod.c Wed Sep 19 06:37:11 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_30_mod.c,v 1.1.2.7 2018/09/15 02:14:39 pgoyette Exp $ */ +/* $NetBSD: compat_30_mod.c,v 1.1.2.8 2018/09/19 06:37:11 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.1.2.7 2018/09/15 02:14:39 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.1.2.8 2018/09/19 06:37:11 pgoyette Exp $"); #include #include @@ -98,7 +98,7 @@ compat_30_fini(void) return error; } -MODULE(MODULE_CLASS_EXEC, compat_30, "compat_40"); +MODULE(MODULE_CLASS_EXEC, compat_30, "compat_util,compat_40"); static int compat_30_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Wed Sep 19 04:22:33 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: Makefile.sysio Log Message: Update for new vnd_50.c source file. Not really necessary to update this, since we're no longer building the "monolithic" compat module. But let's maintain it correctly, at least until we delete the file. To generate a diff of this commit: cvs rdiff -u -r1.7.18.21 -r1.7.18.22 src/sys/compat/common/Makefile.sysio 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/common/Makefile.sysio diff -u src/sys/compat/common/Makefile.sysio:1.7.18.21 src/sys/compat/common/Makefile.sysio:1.7.18.22 --- src/sys/compat/common/Makefile.sysio:1.7.18.21 Tue Apr 17 07:24:54 2018 +++ src/sys/compat/common/Makefile.sysio Wed Sep 19 04:22:33 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.sysio,v 1.7.18.21 2018/04/17 07:24:54 pgoyette Exp $ +# $NetBSD: Makefile.sysio,v 1.7.18.22 2018/09/19 04:22:33 pgoyette Exp $ # Sources for syscall and ioctl compatibility across the versions. @@ -38,7 +38,7 @@ SRCS+= vfs_syscalls_40.c uipc_syscalls_4 # Compatibility code for NetBSD 5.0 SRCS+= kern_50.c kern_time_50.c kern_select_50.c rndpseudo_50.c rtsock_50.c \ vfs_syscalls_50.c uipc_syscalls_50.c uvm_50.c clockctl_50.c \ - if_spppsubr50.c + if_spppsubr50.c vnd_50.c # Compatibility code for NetBSD 6.0 SRCS+= kern_sa_60.c tty_60.c kern_time_60.c kern_cpu_60.c ccd_60.c
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 18 10:35:04 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
netbsd32_compat_80.c netbsd32_mod.c netbsd32_module.c
Log Message:
Use the MP-safe compat hooks for netbsd32_compat_80.c's modctl
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.7 -r1.116.2.8 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.13.16.11 -r1.13.16.12 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.6.2.6 -r1.6.2.7 src/sys/compat/netbsd32/netbsd32_module.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/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 src/sys/compat/netbsd32/netbsd32.h:1.116.2.8
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 Fri Sep 14 09:21:33 2018
+++ src/sys/compat/netbsd32/netbsd32.h Tue Sep 18 10:35:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.7 2018/09/14 09:21:33 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.8 2018/09/18 10:35:04 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1176,8 +1177,8 @@ extern const char * const netbsd32_sysca
extern struct sysctlnode netbsd32_sysctl_root;
struct netbsd32_modctl_args;
-extern int (*vec_compat32_80_modctl)(struct lwp *,
-const struct netbsd32_modctl_args *, register_t *);
+COMPAT_HOOK(compat32_80_modctl_hook,
+(struct lwp *, const struct netbsd32_modctl_args *, register_t *));
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
Index: src/sys/compat/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.4
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.3 Tue Sep 11 09:22:51 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Tue Sep 18 10:35:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.3 2018/09/11 09:22:51 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.4 2018/09/18 10:35:04 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.3 2018/09/11 09:22:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.4 2018/09/18 10:35:04 pgoyette Exp $");
#include
#include
@@ -175,22 +175,22 @@ netbsd32_80_modctl(struct lwp *lwp, cons
return error;
}
+COMPAT_SET_HOOK(compat32_80_modctl_hook, "nb32_modctl_80", netbsd32_80_modctl);
+COMPAT_UNSET_HOOK(compat32_80_modctl_hook);
+
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_80, "compat_netbsd32,compat_80");
static int
compat_netbsd32_80_modcmd(modcmd_t cmd, void *arg)
{
-static int (*orig_netbsd32_80_modctl)(struct lwp *,
-const struct netbsd32_modctl_args *, register_t *);
switch (cmd) {
case MODULE_CMD_INIT:
- orig_netbsd32_80_modctl = vec_compat32_80_modctl;
- vec_compat32_80_modctl = netbsd32_80_modctl;
+ compat32_80_modctl_hook_set();
return 0;
case MODULE_CMD_FINI:
- vec_compat32_80_modctl = orig_netbsd32_80_modctl;
+ compat32_80_modctl_hook_unset();
return 0;
default:
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.11 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.12
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.11 Fri Sep 14 08:38:37 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Tue Sep 18 10:35:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.11 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.12 2018/09/18 10:35:04 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.11 2018/09/14 08:38:37 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.12 2018/09/18 10:35:04 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include
#include
#include
+#include
#include
#include
@@ -51,11 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
-int compat32_80_modctl_compat_stub(struct lwp *,
-const struct netbsd32_modctl_args *, register_t *);
-
-int (*vec_compat32_80_modctl)(struct lwp *,
-const struct netbsd32_modctl_args *, register_t *);
+struct compat32_80_modctl_hook_t compat32_80_modctl_hook;
# define DEPS1 "ksem,coredump,compat_util"
@@ -113,21 +110,18 @@ compat_netbsd32_modcmd(modcmd_t cmd, voi
__arraycount(netbsd32_execsw));
if (error == 0) {
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sat Sep 15 02:14:39 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_09_mod.c compat_10_mod.c compat_12_mod.c compat_13_mod.c compat_14_mod.c compat_16_mod.c compat_20_mod.c compat_30_mod.c compat_40_mod.c compat_50_mod.c compat_60_mod.c compat_70_mod.c compat_80_mod.c Log Message: Since we've already removed the maximum recursion depth for required modules, there's no need for us to force loading of the most-recent (ie, "deepest") modules first. So, simplify the required-modules lists to require only the next-highest version's module. This will also make it easier to add new compat_xx modules for future release versions. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/compat_09_mod.c \ src/sys/compat/common/compat_10_mod.c \ src/sys/compat/common/compat_14_mod.c \ src/sys/compat/common/compat_16_mod.c \ src/sys/compat/common/compat_20_mod.c cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/compat_12_mod.c \ src/sys/compat/common/compat_13_mod.c \ src/sys/compat/common/compat_40_mod.c cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/common/compat_30_mod.c cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/compat/common/compat_50_mod.c cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/sys/compat/common/compat_60_mod.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/compat_70_mod.c \ src/sys/compat/common/compat_80_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/common/compat_09_mod.c diff -u src/sys/compat/common/compat_09_mod.c:1.1.2.3 src/sys/compat/common/compat_09_mod.c:1.1.2.4 --- src/sys/compat/common/compat_09_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018 +++ src/sys/compat/common/compat_09_mod.c Sat Sep 15 02:14:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ +/* $NetBSD: compat_09_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $"); #include #include @@ -69,12 +69,8 @@ compat_09_fini(void) return 0; } -#define REQD_09_1 "compat_80,compat_70,compat_60,compat_50," -#define REQD_09_2 "compat_40,compat_30,compat_20,compat_16," -#define REQD_09_3 "compat_14,compat_13,compat_12,compat_10," -#define REQD_09_4 "compat_util,compat_sysctl_09_43" - -MODULE(MODULE_CLASS_EXEC, compat_09, REQD_09_1 REQD_09_2 REQD_09_3 REQD_09_4); +MODULE(MODULE_CLASS_EXEC, compat_09, +"compat_10,compat_util,compat_sysctl_09_43"); static int compat_09_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/common/compat_10_mod.c diff -u src/sys/compat/common/compat_10_mod.c:1.1.2.3 src/sys/compat/common/compat_10_mod.c:1.1.2.4 --- src/sys/compat/common/compat_10_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018 +++ src/sys/compat/common/compat_10_mod.c Sat Sep 15 02:14:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ +/* $NetBSD: compat_10_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $"); #include #include @@ -62,11 +62,7 @@ compat_10_fini(void) return 0; } -#define REQD_10_1 "compat_80,compat_70,compat_60,compat_50," -#define REQD_10_2 "compat_40,compat_30,compat_20,compat_16," -#define REQD_10_3 "compat_14,compat_13,compat_12,compat_util" - -MODULE(MODULE_CLASS_EXEC, compat_10, REQD_10_1 REQD_10_2 REQD_10_3); +MODULE(MODULE_CLASS_EXEC, compat_10, "compat_12,compat_util"); static int compat_10_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/common/compat_14_mod.c diff -u src/sys/compat/common/compat_14_mod.c:1.1.2.3 src/sys/compat/common/compat_14_mod.c:1.1.2.4 --- src/sys/compat/common/compat_14_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018 +++ src/sys/compat/common/compat_14_mod.c Sat Sep 15 02:14:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ +/* $NetBSD: compat_14_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $"); #include #include @@ -62,10 +62,7 @@ compat_14_fini(void) return 0; } -#define REQD_14_1
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 10:41:48 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.12 -r1.13.2.13 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.12 -r1.24.2.13 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Fri Sep 14 10:41:47 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.13 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Fri Sep 14 10:41:47 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.12 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.14
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Fri Sep 14 10:41:47 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.13
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12 Fri Sep 14 01:21:34 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Fri Sep 14 10:41:47 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -42,6 +42,7 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 10:41:13 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Add MODULAR attribute to sigreturn. I think this is the last one.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.16 -r1.120.2.17 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.16 src/sys/compat/netbsd32/syscalls.master:1.120.2.17
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.16 Fri Sep 14 01:20:52 2018
+++ src/sys/compat/netbsd32/syscalls.master Fri Sep 14 10:41:13 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -259,7 +259,8 @@
102 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||orecv(int s, netbsd32_voidp buf, \
int len, int flags); }
-103 COMPAT_13 { int|netbsd32||sigreturn( \
+103 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|netbsd32||sigreturn( \
netbsd32_sigcontextp_t sigcntxp); } sigreturn13
104 STD { int|netbsd32||bind(int s, netbsd32_sockaddrp_t name, \
int namelen); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 09:21:33 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h Log Message: Forward declaration of struct netbsd32_modctl_args To generate a diff of this commit: cvs rdiff -u -r1.116.2.6 -r1.116.2.7 src/sys/compat/netbsd32/netbsd32.h 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/netbsd32/netbsd32.h diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 src/sys/compat/netbsd32/netbsd32.h:1.116.2.7 --- src/sys/compat/netbsd32/netbsd32.h:1.116.2.6 Fri Sep 14 08:53:22 2018 +++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 09:21:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */ +/* $NetBSD: netbsd32.h,v 1.116.2.7 2018/09/14 09:21:33 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green @@ -1175,6 +1175,7 @@ extern const char * const netbsd32_sysca extern struct sysctlnode netbsd32_sysctl_root; +struct netbsd32_modctl_args; extern int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *);
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 08:53:22 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h netbsd32_module.c
netbsd32_netbsd.c
Log Message:
Move some extern definitions into netbsd32_netbsd.h rather than having
them in the .c files.
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.5 -r1.116.2.6 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.214.2.5 -r1.214.2.6 \
src/sys/compat/netbsd32/netbsd32_netbsd.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/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 src/sys/compat/netbsd32/netbsd32.h:1.116.2.6
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.5 Fri Sep 14 08:38:37 2018
+++ src/sys/compat/netbsd32/netbsd32.h Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.5 2018/09/14 08:38:37 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1167,6 +1167,17 @@ SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_
extern void (*vec_netbsd32_sendsig)(const ksiginfo_t *, const sigset_t *);
+extern struct sysent netbsd32_sysent[];
+extern const uint32_t netbsd32_sysent_nomodbits[];
+#ifdef SYSCALL_DEBUG
+extern const char * const netbsd32_syscallnames[];
+#endif
+
+extern struct sysctlnode netbsd32_sysctl_root;
+
+extern int (*vec_compat32_80_modctl)(struct lwp *,
+const struct netbsd32_modctl_args *, register_t *);
+
/*
* Finally, declare emul_netbsd32 as this is needed in lots of
* places when calling syscall_{,dis}establish()
Index: src/sys/compat/netbsd32/netbsd32_module.c
diff -u src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.6
--- src/sys/compat/netbsd32/netbsd32_module.c:1.6.2.5 Tue Sep 11 04:53:42 2018
+++ src/sys/compat/netbsd32/netbsd32_module.c Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.5 2018/09/11 04:53:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.6 2018/09/14 08:53:22 pgoyette Exp $");
#include
#include
@@ -42,9 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include
#include
-extern int (*vec_compat32_80_modctl)(struct lwp *,
-const struct netbsd32_modctl_args *, register_t *);
-
static int
modctl32_handle_stat(struct netbsd32_iovec *iov, void *arg)
{
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.6
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214.2.5 Wed Sep 12 01:26:40 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Fri Sep 14 08:53:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.5 2018/09/12 01:26:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214.2.6 2018/09/14 08:53:22 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -89,11 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_net
#include
#endif
-extern struct sysent netbsd32_sysent[];
-extern const uint32_t netbsd32_sysent_nomodbits[];
-#ifdef SYSCALL_DEBUG
-extern const char * const netbsd32_syscallnames[];
-#endif
#ifdef __HAVE_SYSCALL_INTERN
void netbsd32_syscall_intern(struct proc *);
#else
@@ -102,8 +97,6 @@ void syscall(void);
#define LIMITCHECK(a, b) ((a) != RLIM_INFINITY && (a) > (b))
-extern struct sysctlnode netbsd32_sysctl_root;
-
#ifdef MODULAR
#include
#endif
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 01:21:34 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.12 -r1.134.2.13 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.12 -r1.132.2.13 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.11 -r1.13.2.12 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.11 -r1.24.2.12 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.12 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.13
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.12 Thu Sep 13 03:50:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Fri Sep 14 01:21:34 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.12 2018/09/13 03:50:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.13 2018/09/14 01:21:34 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.12
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11 Thu Sep 13 03:50:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Fri Sep 14 01:21:34 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.11 2018/09/13 03:50:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.12 2018/09/14 01:21:34 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.13
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12 Thu Sep 13 03:50:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Fri Sep 14 01:21:34 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.13 2018/09/14 01:21:34 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.12
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11 Thu Sep 13 03:50:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Fri Sep 14 01:21:34 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.12 2018/09/14 01:21:34 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -117,6 +117,7 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Fri Sep 14 01:20:52 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Make sigreturn14 MODULAR
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.15 -r1.120.2.16 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.15 src/sys/compat/netbsd32/syscalls.master:1.120.2.16
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.15 Thu Sep 13 03:49:46 2018
+++ src/sys/compat/netbsd32/syscalls.master Fri Sep 14 01:20:52 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.16 2018/09/14 01:20:52 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -687,7 +687,8 @@
netbsd32_sigsetp_t set, \
netbsd32_sigsetp_t oset); }
294 STD { int|netbsd32|14|sigsuspend(netbsd32_sigsetp_t set); }
-295 COMPAT_16 { int|netbsd32|14|sigreturn( \
+295 COMPAT_16 MODULAR compat_netbsd32_16 \
+ { int|netbsd32|14|sigreturn( \
netbsd32_sigcontextp_t sigcntxp); }
296 STD { int|netbsd32||__getcwd(netbsd32_charp bufp, \
netbsd32_size_t length); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Fri Sep 14 00:47:48 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: Require coredump since netbsd32 module will be built with COREDUMP enabled. To generate a diff of this commit: cvs rdiff -u -r1.13.16.8 -r1.13.16.9 src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.9 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 Thu Sep 13 03:51:32 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Fri Sep 14 00:47:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.9 2018/09/14 00:47:48 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.9 2018/09/14 00:47:48 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -57,7 +57,7 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); -# define DEPS1 "ksem,compat_util" +# define DEPS1 "ksem,coredump,compat_util" #if defined(EXEC_ELF32) # define DEPS2 ",exec_elf32"
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 23:33:56 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: kern_time_50.c
Log Message:
Remove duplicate syscall package entry for ntp_gettime30. Duplicate
entries cause a panic when disestablishing, since when it looks at the
second entry it finds that the entrypoint doesn't match what's in the
package (it's alrady been reverted to sys_nosys() by the first entry.)
To generate a diff of this commit:
cvs rdiff -u -r1.31.16.2 -r1.31.16.3 src/sys/compat/common/kern_time_50.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/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.31.16.2 src/sys/compat/common/kern_time_50.c:1.31.16.3
--- src/sys/compat/common/kern_time_50.c:1.31.16.2 Tue Mar 20 08:11:25 2018
+++ src/sys/compat/common/kern_time_50.c Thu Sep 13 23:33:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_50.c,v 1.31.16.2 2018/03/20 08:11:25 pgoyette Exp $ */
+/* $NetBSD: kern_time_50.c,v 1.31.16.3 2018/09/13 23:33:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.31.16.2 2018/03/20 08:11:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.31.16.3 2018/09/13 23:33:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -102,8 +102,6 @@ static const struct syscall_package kern
(sy_call_t *)compat_50_sys_timer_gettime },
{ SYS_compat_50___ntp_gettime30, 0,
(sy_call_t *)compat_50_sys___ntp_gettime30 },
- { SYS_compat_50___ntp_gettime30, 0,
- (sy_call_t *)compat_50_sys___ntp_gettime30 },
{ 0, 0, NULL }
};
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Thu Sep 13 22:53:52 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_09_mod.c compat_10_mod.c compat_12_mod.c compat_13_mod.c compat_14_mod.c compat_16_mod.c compat_30_mod.c compat_40_mod.c compat_43_mod.c compat_50_mod.c compat_60_mod.c Log Message: When unloading a module with MODULE_CMD_FINI, call the compat_xx_fini() routine rather than again calling the compat_xx_init() routine! (Cut strikes again) To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/compat_09_mod.c \ src/sys/compat/common/compat_10_mod.c \ src/sys/compat/common/compat_14_mod.c \ src/sys/compat/common/compat_16_mod.c \ src/sys/compat/common/compat_43_mod.c cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/compat_12_mod.c \ src/sys/compat/common/compat_13_mod.c \ src/sys/compat/common/compat_40_mod.c cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/compat_30_mod.c cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/compat/common/compat_50_mod.c cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/compat/common/compat_60_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/common/compat_09_mod.c diff -u src/sys/compat/common/compat_09_mod.c:1.1.2.2 src/sys/compat/common/compat_09_mod.c:1.1.2.3 --- src/sys/compat/common/compat_09_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018 +++ src/sys/compat/common/compat_09_mod.c Thu Sep 13 22:53:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_09_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */ +/* $NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); #include #include @@ -84,7 +84,7 @@ compat_09_modcmd(modcmd_t cmd, void *arg case MODULE_CMD_INIT: return compat_09_init(); case MODULE_CMD_FINI: - return compat_09_init(); + return compat_09_fini(); default: return ENOTTY; } Index: src/sys/compat/common/compat_10_mod.c diff -u src/sys/compat/common/compat_10_mod.c:1.1.2.2 src/sys/compat/common/compat_10_mod.c:1.1.2.3 --- src/sys/compat/common/compat_10_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018 +++ src/sys/compat/common/compat_10_mod.c Thu Sep 13 22:53:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_10_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */ +/* $NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); #include #include @@ -76,7 +76,7 @@ compat_10_modcmd(modcmd_t cmd, void *arg case MODULE_CMD_INIT: return compat_10_init(); case MODULE_CMD_FINI: - return compat_10_init(); + return compat_10_fini(); default: return ENOTTY; } Index: src/sys/compat/common/compat_14_mod.c diff -u src/sys/compat/common/compat_14_mod.c:1.1.2.2 src/sys/compat/common/compat_14_mod.c:1.1.2.3 --- src/sys/compat/common/compat_14_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018 +++ src/sys/compat/common/compat_14_mod.c Thu Sep 13 22:53:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_14_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */ +/* $NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $"); #include #include @@ -75,7 +75,7 @@ compat_14_modcmd(modcmd_t cmd, void *arg case MODULE_CMD_INIT: return compat_14_init(); case MODULE_CMD_FINI: - return compat_14_init(); + return compat_14_fini(); default: return ENOTTY; } Index: src/sys/compat/common/compat_16_mod.c diff -u src/sys/compat/common/compat_16_mod.c:1.1.2.2 src/sys/compat/common/compat_16_mod.c:1.1.2.3 --- src/sys/compat/common/compat_16_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018 +++ src/sys/compat/common/compat_16_mod.c Thu Sep 13 22:53:52 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_16_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */ +/* $NetBSD: compat_16_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_16_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_16_mod.c,v 1.1.2.3 2018/09/13
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Thu Sep 13 21:42:25 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_20_mod.c Log Message: Fix typo - Don't try to re-init the submodule when doing MODULE_CMD_fINI! To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/compat_20_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/common/compat_20_mod.c diff -u src/sys/compat/common/compat_20_mod.c:1.1.2.2 src/sys/compat/common/compat_20_mod.c:1.1.2.3 --- src/sys/compat/common/compat_20_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018 +++ src/sys/compat/common/compat_20_mod.c Thu Sep 13 21:42:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_20_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */ +/* $NetBSD: compat_20_mod.c,v 1.1.2.3 2018/09/13 21:42:24 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_20_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_20_mod.c,v 1.1.2.3 2018/09/13 21:42:24 pgoyette Exp $"); #include #include @@ -90,7 +90,7 @@ compat_20_modcmd(modcmd_t cmd, void *arg case MODULE_CMD_INIT: return compat_20_init(); case MODULE_CMD_FINI: - return compat_20_init(); + return compat_20_fini(); default: return ENOTTY; }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 03:51:32 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c netbsd32_mod.c Log Message: More clean-up of module dependencies To generate a diff of this commit: cvs rdiff -u -r1.18.16.5 -r1.18.16.6 src/sys/compat/netbsd32/netbsd32_ipc.c cvs rdiff -u -r1.13.16.7 -r1.13.16.8 src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_ipc.c diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.6 --- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 Wed Sep 12 23:28:16 2018 +++ src/sys/compat/netbsd32/netbsd32_ipc.c Thu Sep 13 03:51:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.18.16.6 2018/09/13 03:51:32 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.6 2018/09/13 03:51:32 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -83,7 +83,7 @@ static const struct syscall_package comp }; MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, -"sysv_ipc,compat_netbsd32,sysv_ipc"); +"compat_netbsd32,sysv_ipc"); static int compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg) Index: src/sys/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.8 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 Thu Sep 13 02:03:49 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 03:51:32 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.8 2018/09/13 03:51:32 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -57,7 +57,7 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); -# define DEPS1 "ksem" +# define DEPS1 "ksem,compat_util" #if defined(EXEC_ELF32) # define DEPS2 ",exec_elf32"
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 03:50:24 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.11 -r1.134.2.12 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.11 -r1.132.2.12 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.10 -r1.13.2.11 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.10 -r1.24.2.11 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.12
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu Sep 13 03:50:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.12 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.11
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu Sep 13 03:50:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.11 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.12
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu Sep 13 03:50:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.12 2018/09/13 03:50:24 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.11
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10 Wed Sep 12 23:27:24 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Thu Sep 13 03:50:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.11 2018/09/13 03:50:24 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -22,17 +22,21 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 03:49:47 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
More MODULAR tags
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.14 -r1.120.2.15 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.14 src/sys/compat/netbsd32/syscalls.master:1.120.2.15
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.14 Wed Sep 12 23:26:38 2018
+++ src/sys/compat/netbsd32/syscalls.master Thu Sep 13 03:49:46 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.15 2018/09/13 03:49:46 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -156,7 +156,8 @@
u_int namelen); }
50 STD { int|netbsd32||setlogin(netbsd32_charp namebuf); }
51 STD { int|netbsd32||acct(netbsd32_charp path); }
-52 COMPAT_13 { int|sys||sigpending(void); } sigpending13
+52 COMPAT_13 MODULAR compat_netbsd32_13 \
+ { int|sys||sigpending(void); } sigpending13
53 COMPAT_13 MODULAR compat_netbsd32_13 \
{ int|netbsd32||sigaltstack13( \
netbsd32_sigaltstack13p_t nss, \
@@ -180,7 +181,8 @@
{ int|netbsd32||ogetkerninfo(int op, \
netbsd32_charp where, netbsd32_intp size, \
int arg); }
-64 COMPAT_43 { int|sys||getpagesize(void); } ogetpagesize
+64 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||getpagesize(void); } ogetpagesize
65 COMPAT_12 MODULAR compat_netbsd32_12 \
{ int|netbsd32||msync(netbsd32_voidp addr, \
netbsd32_size_t len); }
@@ -215,7 +217,8 @@
{ int|netbsd32||setitimer(int which, \
netbsd32_itimerval50p_t itv, \
netbsd32_itimerval50p_t oitv); }
-84 COMPAT_43 { int|sys||wait(void); } owait
+84 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||wait(void); } owait
85 COMPAT_12 MODULAR compat_netbsd32_12 \
{ int|netbsd32||oswapon(netbsd32_charp name); }
86 COMPAT_50 MODULAR compat_netbsd32_50 \
@@ -227,7 +230,8 @@
88 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||osethostname(netbsd32_charp hostname, \
u_int len); }
-89 COMPAT_43 { int|sys||getdtablesize(void); } ogetdtablesize
+89 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||getdtablesize(void); } ogetdtablesize
90 STD { int|netbsd32||dup2(int from, int to); }
91 UNIMPL getdopt
92 STD { int|netbsd32||fcntl(int fd, int cmd, \
@@ -336,7 +340,8 @@
141 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||ogetpeername(int fdes, \
netbsd32_voidp asa, netbsd32_intp alen); }
-142 COMPAT_43 { int32_t|sys||gethostid(void); } ogethostid
+142 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int32_t|sys||gethostid(void); } ogethostid
143 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||sethostid(int32_t hostid); }
144 COMPAT_43 MODULAR compat_netbsd32_43 \
@@ -351,7 +356,8 @@
148 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||quotactl(netbsd32_charp path, int cmd, \
int uid, netbsd32_voidp arg); }
-149 COMPAT_43 { int|sys||quota(void); } oquota
+149 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|sys||quota(void); } oquota
150 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||ogetsockname(int fdec, \
netbsd32_voidp asa, netbsd32_intp alen); }
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Thu Sep 13 02:03:49 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c
Log Message:
Now that compat_netbsd32 is no longer monolithic, it no longer
requires compat_09 (and all higher) compat code. Adjust the
requirements list accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.13.16.6 -r1.13.16.7 src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 Tue Sep 11 23:26:21 2018
+++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 02:03:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -48,14 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod
#include
#include
-# define DEPS1 "compat_09,ksem"
-
-#if defined(EXEC_ELF32)
-# define DEPS2 ",exec_elf32"
-#else
-# define DEPS2 ""
-#endif
-
#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
@@ -65,6 +57,14 @@ int compat32_80_modctl_compat_stub(struc
int (*vec_compat32_80_modctl)(struct lwp *,
const struct netbsd32_modctl_args *, register_t *);
+# define DEPS1 "ksem"
+
+#if defined(EXEC_ELF32)
+# define DEPS2 ",exec_elf32"
+#else
+# define DEPS2 ""
+#endif
+
MODULE(MODULE_CLASS_EXEC, compat_netbsd32, DEPS1 DEPS2);
static struct execsw netbsd32_execsw[] = {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Thu Sep 13 01:15:59 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_60.c Log Message: Another dependency typo To generate a diff of this commit: cvs rdiff -u -r1.3.2.6 -r1.3.2.7 src/sys/compat/netbsd32/netbsd32_compat_60.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/netbsd32/netbsd32_compat_60.c diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.7 --- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.6 Tue Sep 11 21:18:32 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_60.c Thu Sep 13 01:15:59 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.7 2018/09/13 01:15:59 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.6 2018/09/11 21:18:32 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.7 2018/09/13 01:15:59 pgoyette Exp $"); #include #include @@ -94,7 +94,7 @@ static struct syscall_package compat_net }; -MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd,compat_60"); +MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd32,compat_60"); static int compat_netbsd32_60_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Thu Sep 13 00:15:01 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: compat_sysv_10_mod.c compat_sysv_14_mod.c Log Message: Fix some module requirements To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/compat_sysv_10_mod.c \ src/sys/compat/common/compat_sysv_14_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/common/compat_sysv_10_mod.c diff -u src/sys/compat/common/compat_sysv_10_mod.c:1.1.2.1 src/sys/compat/common/compat_sysv_10_mod.c:1.1.2.2 --- src/sys/compat/common/compat_sysv_10_mod.c:1.1.2.1 Tue Apr 17 23:06:11 2018 +++ src/sys/compat/common/compat_sysv_10_mod.c Thu Sep 13 00:15:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sysv_10_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $ */ +/* $NetBSD: compat_sysv_10_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_sysv_10_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_sysv_10_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -44,7 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: compat_sysv_ #include #include -MODULE(MODULE_CLASS_EXEC, compat_sysv_10, "sysv_ipc,sysv_50,sysv_14"); +MODULE(MODULE_CLASS_EXEC, compat_sysv_10, +"sysv_ipc,compat_sysv_50,compat_sysv_14"); /* Build the syscall package based on options specified */ Index: src/sys/compat/common/compat_sysv_14_mod.c diff -u src/sys/compat/common/compat_sysv_14_mod.c:1.1.2.1 src/sys/compat/common/compat_sysv_14_mod.c:1.1.2.2 --- src/sys/compat/common/compat_sysv_14_mod.c:1.1.2.1 Tue Apr 17 23:06:11 2018 +++ src/sys/compat/common/compat_sysv_14_mod.c Thu Sep 13 00:15:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_sysv_14_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $ */ +/* $NetBSD: compat_sysv_14_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: compat_sysv_14_mod.c,v 1.1.2.1 2018/04/17 23:06:11 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_sysv_14_mod.c,v 1.1.2.2 2018/09/13 00:15:00 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_sysv_ #include #include -MODULE(MODULE_CLASS_EXEC, compat_sysv_14, "sysv_ipc_50,sysv_ipc"); +MODULE(MODULE_CLASS_EXEC, compat_sysv_14, "compat_sysv_50,sysv_ipc"); /* Build the syscall package based on options specified */
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Wed Sep 12 23:28:16 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_ipc.c Log Message: Use correct module name for dependency To generate a diff of this commit: cvs rdiff -u -r1.18.16.4 -r1.18.16.5 src/sys/compat/netbsd32/netbsd32_ipc.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/netbsd32/netbsd32_ipc.c diff -u src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.4 src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.5 --- src/sys/compat/netbsd32/netbsd32_ipc.c:1.18.16.4 Wed Sep 12 04:35:22 2018 +++ src/sys/compat/netbsd32/netbsd32_ipc.c Wed Sep 12 23:28:16 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.18.16.4 2018/09/12 04:35:22 pgoyette Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.4 2018/09/12 04:35:22 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.18.16.5 2018/09/12 23:28:16 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -83,7 +83,7 @@ static const struct syscall_package comp }; MODULE(MODULE_CLASS_EXEC, compat_netbsd32_sysvipc, -"sysv_ipc,compat_netbsd32,compat_sysv"); +"sysv_ipc,compat_netbsd32,sysv_ipc"); static int compat_netbsd32_sysvipc_modcmd(modcmd_t cmd, void *arg)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 23:27:25 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.10 -r1.134.2.11 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.10 -r1.132.2.11 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.9 -r1.13.2.10 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.9 -r1.24.2.10 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.11
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 23:27:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.10 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.10
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 23:27:24 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.9 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.11
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 23:27:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.11 2018/09/12 23:27:24 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.10
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9 Wed Sep 12 03:22:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 23:27:24 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.10 2018/09/12 23:27:24 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -38,6 +38,7 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 23:26:38 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Missed a couple of MODULAR tags
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.13 -r1.120.2.14 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.13 src/sys/compat/netbsd32/syscalls.master:1.120.2.14
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.13 Wed Sep 12 03:21:14 2018
+++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 23:26:38 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.14 2018/09/12 23:26:38 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -263,7 +263,8 @@
netbsd32_voidp val, int valsize); }
106 STD { int|netbsd32||listen(int s, int backlog); }
107 OBSOL vtimes
-108 COMPAT_43 { int|netbsd32||osigvec(int signum, \
+108 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||osigvec(int signum, \
netbsd32_sigvecp_t nsv, netbsd32_sigvecp_t osv); }
109 COMPAT_43 MODULAR compat_netbsd32_43 \
{ int|netbsd32||sigblock(int mask); }
@@ -447,7 +448,8 @@
netbsd32_rlimitp_t rlp); }
195 STD { int|netbsd32||setrlimit(int which, \
netbsd32_rlimitp_t rlp); }
-196 COMPAT_12 { int|netbsd32||getdirentries(int fd, \
+196 COMPAT_12 MODULAR compat_netbsd32_12 \
+ { int|netbsd32||getdirentries(int fd, \
netbsd32_charp buf, u_int count, \
netbsd32_longp basep); }
197 STD { netbsd32_voidp|netbsd32||mmap(netbsd32_voidp addr, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 21:52:17 UTC 2018
Added Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_16.c
netbsd32_compat_40.c
Log Message:
Add some more module glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_16.c \
src/sys/compat/netbsd32/netbsd32_compat_40.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/compat/netbsd32/netbsd32_compat_16.c
diff -u /dev/null src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.1
--- /dev/null Wed Sep 12 21:52:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Sep 12 21:52:17 2018
@@ -0,0 +1,79 @@
+/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *contributors may be used to endorse or promote products derived
+ *from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+extern char netbsd32_sigcode[], netbsd32_esigcode[];
+struct uvm_object *emul_netbsd32_object;
+
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, "compat_netbsd32,compat_16");
+
+static int
+compat_netbsd32_16_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ emul_netbsd32.e_sigcode = netbsd32_sigcode;
+ emul_netbsd32.e_esigcode = netbsd32_esigcode;
+ emul_netbsd32.e_sigobject = _netbsd32_object;
+ return 0;
+
+ case MODULE_CMD_FINI:
+ emul_netbsd32.e_sigcode = NULL;
+ emul_netbsd32.e_esigcode = NULL;
+ emul_netbsd32.e_sigobject = NULL;
+ return 0;
+
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/compat/netbsd32/netbsd32_compat_40.c
diff -u /dev/null src/sys/compat/netbsd32/netbsd32_compat_40.c:1.1.2.1
--- /dev/null Wed Sep 12 21:52:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_40.c Wed Sep 12 21:52:17 2018
@@ -0,0 +1,97 @@
+/* $NetBSD: netbsd32_compat_40.c,v 1.1.2.1 2018/09/12 21:52:17 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *
CVS commit: [pgoyette-compat] src/sys/compat/linux32/common
Module Name:src Committed By: pgoyette Date: Wed Sep 12 08:09:23 UTC 2018 Modified Files: src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c Log Message: Typo - missing trailing quote To generate a diff of this commit: cvs rdiff -u -r1.11.2.2 -r1.11.2.3 \ 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/common/linux32_mod.c diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.3 --- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2 Wed Sep 12 07:45:56 2018 +++ src/sys/compat/linux32/common/linux32_mod.c Wed Sep 12 08:09:23 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $ */ +/* $NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod. #define REQ1 "compat_linux,compat_sysv_50" #define REQ2 ",compat_netbsd32_43,compat_netbsd32_50,compat_netbsd32_12" -#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16 +#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16" #define REQ4",compat_ossaudio,sysv_ipc,compat_netbsd32_sysvipc" MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3 REQ4 MD1);
CVS commit: [pgoyette-compat] src/sys/compat
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 07:45:56 UTC 2018
Modified Files:
src/sys/compat/linux/common [pgoyette-compat]: linux_mod.c
src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c
Log Message:
Adjust module requirements to reflect the new more granular modules
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \
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/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.10 src/sys/compat/linux/common/linux_mod.c:1.10.2.1
--- src/sys/compat/linux/common/linux_mod.c:1.10 Sun Dec 10 00:43:05 2017
+++ src/sys/compat/linux/common/linux_mod.c Wed Sep 12 07:45:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_mod.c,v 1.10 2017/12/10 00:43:05 kre Exp $ */
+/* $NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10 2017/12/10 00:43:05 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -66,8 +66,10 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
# define MD3 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,sysv_ipc"
- MD1 MD2 MD3);
+#define REQ1",compat_ossaudio,sysv_ipc"
+#define REQ2",compat_12,compat_30,compat_50,compat_43,compat_sysv_50"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux, REQ1 REQ2 MD1 MD2 MD3);
static struct execsw linux_execsw[] = {
#if defined(EXEC_ELF32) && ELFSIZE == 32
Index: src/sys/compat/linux32/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2
--- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1 Sun Mar 11 23:50:18 2018
+++ src/sys/compat/linux32/common/linux32_mod.c Wed Sep 12 07:45:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $ */
+/* $NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -57,7 +57,12 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.
# define MD1 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_linux32, "compat_linux,compat_sysv" MD1);
+#define REQ1 "compat_linux,compat_sysv_50"
+#define REQ2 ",compat_netbsd32_43,compat_netbsd32_50,compat_netbsd32_12"
+#define REQ3 ",compat_netbsd32_30,compat_netbsd32_16
+#define REQ4",compat_ossaudio,sysv_ipc,compat_netbsd32_sysvipc"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3 REQ4 MD1);
static struct execsw linux32_execsw[] = {
#if defined(EXEC_ELF32)
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 03:22:08 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.9 -r1.134.2.10 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.8 -r1.134.2.9 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.9 -r1.132.2.10 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.8 -r1.13.2.9 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.8 -r1.132.2.9 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.8 -r1.24.2.9 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.9 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.10
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.9 Wed Sep 12 00:22:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 03:22:07 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.9 2018/09/12 00:22:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.10 2018/09/12 03:22:07 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.8 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.9
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.8 Wed Sep 12 00:22:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 03:22:07 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.8 2018/09/12 00:22:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.9 2018/09/12 03:22:07 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.9 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.10
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.9 Wed Sep 12 00:22:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 03:22:07 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.10 2018/09/12 03:22:07 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.8 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.9
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.8 Wed Sep 12 00:22:26 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 03:22:07 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.8 2018/09/12 00:22:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.8 2018/09/12 00:22:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.9 2018/09/12 03:22:07 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -67,24 +67,24 @@ static struct sc_autoload netbsd32_sysca
{
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 03:21:14 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Prepare for splitting compat_netbsd32_sysvipc into version-specific modules
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.12 -r1.120.2.13 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.12 src/sys/compat/netbsd32/syscalls.master:1.120.2.13
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.12 Wed Sep 12 00:20:53 2018
+++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 03:21:14 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.13 2018/09/12 03:21:14 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -392,13 +392,13 @@
166 UNIMPL
167 UNIMPL
168 UNIMPL
-169 COMPAT_10 MODULAR compat_netbsd32_sysvipc \
+169 COMPAT_10 MODULAR compat_netbsd32_sysvipc_10 \
{ int|netbsd32||semsys(int which, int a2, int a3, \
int a4, int a5); } osemsys
-170 COMPAT_10 MODULAR compat_netbsd32_sysvipc \
+170 COMPAT_10 MODULAR compat_netbsd32_sysvipc_10 \
{ int|netbsd32||msgsys(int which, int a2, int a3, \
int a4, int a5, int a6); } omsgsys
-171 COMPAT_10 MODULAR compat_netbsd32_sysvipc \
+171 COMPAT_10 MODULAR compat_netbsd32_sysvipc_10 \
{ int|netbsd32||shmsys(int which, int a2, int a3, \
int a4); } oshmsys
172 UNIMPL
@@ -490,7 +490,7 @@
218 UNIMPL
219 UNIMPL
; System calls 220-300 are reserved for use by NetBSD
-220 COMPAT_14 MODULAR compat_netbsd32_sysvipc \
+220 COMPAT_14 MODULAR compat_netbsd32_sysvipc_14 \
{ int|netbsd32||__semctl(int semid, int semnum, \
int cmd, netbsd32_semunu_t arg); }
221 STD MODULAR compat_netbsd32_sysvipc \
@@ -501,7 +501,7 @@
netbsd32_sembufp_t sops, netbsd32_size_t nsops); }
223 STD MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||semconfig(int flag); }
-224 COMPAT_14 MODULAR compat_netbsd32_sysvipc \
+224 COMPAT_14 MODULAR compat_netbsd32_sysvipc_14 \
{ int|netbsd32||msgctl(int msqid, int cmd, \
netbsd32_msqid_ds14p_t buf); }
225 STD MODULAR compat_netbsd32_sysvipc \
@@ -516,7 +516,7 @@
228 STD MODULAR compat_netbsd32_sysvipc \
{ netbsd32_voidp|netbsd32||shmat(int shmid, \
netbsd32_voidp shmaddr, int shmflg); }
-229 COMPAT_14 MODULAR compat_netbsd32_sysvipc \
+229 COMPAT_14 MODULAR compat_netbsd32_sysvipc_14 \
{ int|netbsd32||shmctl(int shmid, int cmd, \
netbsd32_shmid_dsp_t buf); }
230 STD MODULAR compat_netbsd32_sysvipc \
@@ -693,13 +693,13 @@
300 COMPAT_20 MODULAR compat_netbsd32_20 \
{ int|netbsd32||fhstatfs(netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t buf); }
-301 COMPAT_50 MODULAR compat_netbsd32_sysvipc \
+301 COMPAT_50 MODULAR compat_netbsd32_sysvipc_50 \
{ int|netbsd32|14|semctl(int semid, int semnum, \
int cmd, ... netbsd32_semun50p_t arg); }
-302 COMPAT_50 MODULAR compat_netbsd32_sysvipc \
+302 COMPAT_50 MODULAR compat_netbsd32_sysvipc_50 \
{ int|netbsd32|13|msgctl(int msqid, int cmd, \
netbsd32_msqid_ds50p_t buf); }
-303 COMPAT_50 MODULAR compat_netbsd32_sysvipc \
+303 COMPAT_50 MODULAR compat_netbsd32_sysvipc_50 \
{ int|netbsd32|13|shmctl(int shmid, int cmd, \
netbsd32_shmid_ds50p_t buf); }
304 STD { int|netbsd32||lchflags(netbsd32_charp path, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 00:22:26 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.8 -r1.134.2.9 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.7 -r1.134.2.8 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.8 -r1.132.2.9 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.7 -r1.13.2.8 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.7 -r1.132.2.8 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.7 -r1.24.2.8 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.8 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.9
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.8 Wed Sep 12 00:00:31 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 00:22:26 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.8 2018/09/12 00:00:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.9 2018/09/12 00:22:26 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -73,8 +73,8 @@
/* syscall: "getpid" ret: "pid_t" args: */
#define NETBSD32_SYS_getpid 20
-/* syscall: "netbsd32_mount" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "int" "netbsd32_voidp" */
-#define NETBSD32_SYS_netbsd32_mount 21
+/* syscall: "compat_40_netbsd32_mount" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "int" "netbsd32_voidp" */
+#define NETBSD32_SYS_compat_40_netbsd32_mount 21
/* syscall: "netbsd32_unmount" ret: "int" args: "netbsd32_charp" "int" */
#define NETBSD32_SYS_netbsd32_unmount 22
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.7 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.8
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.7 Wed Sep 12 00:00:31 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 00:22:26 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.7 2018/09/12 00:00:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.8 2018/09/12 00:22:26 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -144,13 +144,13 @@ struct compat_43_netbsd32_olseek_args {
};
check_syscall_args(compat_43_netbsd32_olseek)
-struct netbsd32_mount_args {
+struct compat_40_netbsd32_mount_args {
syscallarg(netbsd32_charp) type;
syscallarg(netbsd32_charp) path;
syscallarg(int) flags;
syscallarg(netbsd32_voidp) data;
};
-check_syscall_args(netbsd32_mount)
+check_syscall_args(compat_40_netbsd32_mount)
struct netbsd32_unmount_args {
syscallarg(netbsd32_charp) path;
@@ -2663,7 +2663,7 @@ int compat_43_netbsd32_olseek(struct lwp
int sys_getpid(struct lwp *, const void *, register_t *);
-int netbsd32_mount(struct lwp *, const struct netbsd32_mount_args *, register_t *);
+int compat_40_netbsd32_mount(struct lwp *, const struct compat_40_netbsd32_mount_args *, register_t *);
int netbsd32_unmount(struct lwp *, const struct netbsd32_unmount_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.8 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.9
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.8 Wed Sep 12 00:00:31 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 00:22:26 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.9 2018/09/12 00:22:26 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $");
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 00:20:53 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
The netbsd32 40 mount code belongs in a netbsd32 40 module
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.11 -r1.120.2.12 \
src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.11 src/sys/compat/netbsd32/syscalls.master:1.120.2.12
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.11 Tue Sep 11 23:58:46 2018
+++ src/sys/compat/netbsd32/syscalls.master Wed Sep 12 00:20:53 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.12 2018/09/12 00:20:53 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -96,7 +96,8 @@
{ netbsd32_long|netbsd32||olseek(int fd, \
netbsd32_long offset, int whence); }
20 NOARGS { pid_t|sys||getpid(void); }
-21 STD { int|netbsd32||mount(netbsd32_charp type, \
+21 COMPAT_40 MODULAR compat_netbsd32_40 \
+ { int|netbsd32||mount(netbsd32_charp type, \
netbsd32_charp path, int flags, \
netbsd32_voidp data); }
22 STD { int|netbsd32||unmount(netbsd32_charp path, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Wed Sep 12 00:00:32 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen with updated module information for ntp 30 and 50 compat calls
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.7 -r1.134.2.8 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.6 -r1.134.2.7 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.7 -r1.132.2.8 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.6 -r1.13.2.7 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.6 -r1.132.2.7 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.6 -r1.24.2.7 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.7 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.8
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.7 Tue Sep 11 08:36:29 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Wed Sep 12 00:00:31 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.7 2018/09/11 08:36:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.8 2018/09/12 00:00:31 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.6 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.7
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.6 Tue Sep 11 08:36:29 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Wed Sep 12 00:00:31 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.6 2018/09/11 08:36:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.7 2018/09/12 00:00:31 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.7 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.8
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.7 Tue Sep 11 08:36:29 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Wed Sep 12 00:00:31 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.7 2018/09/11 08:36:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.7 2018/09/11 08:36:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.8 2018/09/12 00:00:31 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.6 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.7
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.6 Tue Sep 11 08:36:29 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Wed Sep 12 00:00:31 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.6 2018/09/11 08:36:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.7 2018/09/12 00:00:31 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.11 2018/09/11 23:58:46 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.6 2018/09/11 08:36:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.7 2018/09/12 00:00:31 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -69,6 +69,7 @@ static struct sc_autoload
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 21:18:33 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32.h
netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c
netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_43.c
netbsd32_compat_50.c netbsd32_compat_60.c netbsd32_exec.h
netbsd32_ipc.c netbsd32_mqueue.c netbsd32_nfssvc.c
netbsd32_ptrace.c
Log Message:
Put the ``extern struct emul'' into the netbsd32_netbsd.h header
so it doesn't have to be separately declared in each source file.
Thanks mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.116.2.3 -r1.116.2.4 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.18.86.4 -r1.18.86.5 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.6 -r1.33.36.7 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.5 -r1.26.28.6 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.7 -r1.36.10.8 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.6 -r1.31.16.7 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.54.14.4 -r1.54.14.5 \
src/sys/compat/netbsd32/netbsd32_compat_43.c
cvs rdiff -u -r1.32.16.5 -r1.32.16.6 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/compat/netbsd32/netbsd32_compat_60.c
cvs rdiff -u -r1.33 -r1.33.12.1 src/sys/compat/netbsd32/netbsd32_exec.h
cvs rdiff -u -r1.18.16.2 -r1.18.16.3 src/sys/compat/netbsd32/netbsd32_ipc.c
cvs rdiff -u -r1.6.18.2 -r1.6.18.3 src/sys/compat/netbsd32/netbsd32_mqueue.c
cvs rdiff -u -r1.5 -r1.5.16.1 src/sys/compat/netbsd32/netbsd32_nfssvc.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/compat/netbsd32/netbsd32_ptrace.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/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.116.2.3 src/sys/compat/netbsd32/netbsd32.h:1.116.2.4
--- src/sys/compat/netbsd32/netbsd32.h:1.116.2.3 Thu Sep 6 06:55:46 2018
+++ src/sys/compat/netbsd32/netbsd32.h Tue Sep 11 21:18:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.116.2.3 2018/09/06 06:55:46 pgoyette Exp $ */
+/* $NetBSD: netbsd32.h,v 1.116.2.4 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001, 2008, 2015 Matthew R. Green
@@ -1164,4 +1164,12 @@ struct iovec *netbsd32_get_iov(struct ne
#ifdef SYSCTL_SETUP_PROTO
SYSCTL_SETUP_PROTO(netbsd32_sysctl_emul_setup);
#endif /* SYSCTL_SETUP_PROTO */
+
+/*
+ * Finally, declare emul_netbsd32 as this is needed in lots of
+ * places when calling syscall_{,dis}establish()
+ */
+
+extern struct emul emul_netbsd32;
+
#endif /* _COMPAT_NETBSD32_NETBSD32_H_ */
Index: src/sys/compat/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.5
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 21:18:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.5 2018/09/11 21:18:32 pgoyette Exp $");
#include
#include
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
-extern struct emul emul_netbsd32;
-
int
compat_09_netbsd32_ogetdomainname(struct lwp *l, const struct compat_09_netbsd32_ogetdomainname_args *uap, register_t *retval)
{
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.7
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6 Tue Sep 11 05:00:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 21:18:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.7 2018/09/11 21:18:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -54,8 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
-extern struct emul emul_netbsd32;
-
static void netbsd32_stat12_to_netbsd32(struct stat12 *,
struct netbsd32_stat12 *);
Index:
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src Committed By: pgoyette Date: Tue Sep 11 09:22:51 UTC 2018 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_80.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/netbsd32/netbsd32_compat_80.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/netbsd32/netbsd32_compat_80.c diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.3 --- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.2 Tue Sep 11 05:48:07 2018 +++ src/sys/compat/netbsd32/netbsd32_compat_80.c Tue Sep 11 09:22:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.2 2018/09/11 05:48:07 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.3 2018/09/11 09:22:51 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.2 2018/09/11 05:48:07 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.3 2018/09/11 09:22:51 pgoyette Exp $"); #include #include @@ -156,9 +156,6 @@ netbsd32_80_modctl(struct lwp *lwp, cons struct netbsd32_iovec iov; int error; void *arg; -#ifdef MODULAR - uintptr_t loadtype; -#endif arg = SCARG_P32(uap, arg);
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 08:51:55 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_43.c
Log Message:
Typo
To generate a diff of this commit:
cvs rdiff -u -r1.54.14.3 -r1.54.14.4 \
src/sys/compat/netbsd32/netbsd32_compat_43.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/netbsd32/netbsd32_compat_43.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.3 src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.4
--- src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.3 Tue Sep 11 08:42:23 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_43.c Tue Sep 11 08:51:55 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_43.c,v 1.54.14.3 2018/09/11 08:42:23 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_43.c,v 1.54.14.4 2018/09/11 08:51:55 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.14.3 2018/09/11 08:42:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.14.4 2018/09/11 08:51:55 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
@@ -754,7 +754,7 @@ static struct syscall_package compat_net
(sy_call_t *)compat_43_netbsd32_orecv },
{ NETBSD32_SYS_compat_43_netbsd32_orecvmsg, 0,
(sy_call_t *)compat_43_netbsd32_orecvmsg },
- { compat_43_netbsd32_osendmsg, 0,
+ { NETBSD32_SYS_compat_43_netbsd32_osendmsg, 0,
(sy_call_t *)compat_43_netbsd32_osendmsg },
{ NETBSD32_SYS_compat_43_netbsd32_orecvfrom, 0,
(sy_call_t *)compat_43_netbsd32_orecvfrom },
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 08:42:23 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_43.c
Log Message:
Make compat_netbsd32_43 into a stand-alone module.
To generate a diff of this commit:
cvs rdiff -u -r1.54.14.2 -r1.54.14.3 \
src/sys/compat/netbsd32/netbsd32_compat_43.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/netbsd32/netbsd32_compat_43.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.2 src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.3
--- src/sys/compat/netbsd32/netbsd32_compat_43.c:1.54.14.2 Mon May 21 04:36:03 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_43.c Tue Sep 11 08:42:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_43.c,v 1.54.14.2 2018/05/21 04:36:03 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_43.c,v 1.54.14.3 2018/09/11 08:42:23 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.14.2 2018/05/21 04:36:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.54.14.3 2018/09/11 08:42:23 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+#include
#include
#include
#include
@@ -45,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
#include
+#include
#include
#include
#include
@@ -54,6 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+#include
#include
#include
@@ -67,10 +70,11 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
SYS_DEF(compat_43_netbsd32_sethostid);
SYS_DEF(compat_43_netbsd32_killpg);
SYS_DEF(compat_43_netbsd32_sigblock);
-SYS_DEF(compat_43_netbsd32_sigblock);
SYS_DEF(compat_43_netbsd32_sigsetmask);
#undef SYS_DEF
+extern struct emul emul_netbsd32;
+
static void
netbsd32_from_stat(const struct stat *sb, struct netbsd32_stat43 *sp32)
{
@@ -708,3 +712,83 @@ compat_43_netbsd32_osigstack(struct lwp
return error;
}
+
+static struct syscall_package compat_netbsd32_43_syscalls[] = {
+ { NETBSD32_SYS_compat_43_netbsd32_ocreat, 0,
+ (sy_call_t *)compat_43_netbsd32_ocreat },
+ { NETBSD32_SYS_compat_43_netbsd32_olseek, 0,
+ (sy_call_t *)compat_43_netbsd32_olseek },
+ { NETBSD32_SYS_compat_43_netbsd32_stat43, 0,
+ (sy_call_t *)compat_43_netbsd32_stat43 },
+ { NETBSD32_SYS_compat_43_netbsd32_lstat43, 0,
+ (sy_call_t *)compat_43_netbsd32_lstat43 },
+ { NETBSD32_SYS_compat_43_netbsd32_fstat43, 0,
+ (sy_call_t *)compat_43_netbsd32_fstat43 },
+ { NETBSD32_SYS_compat_43_netbsd32_otruncate, 0,
+ (sy_call_t *)compat_43_netbsd32_otruncate },
+ { NETBSD32_SYS_compat_43_netbsd32_oftruncate, 0,
+ (sy_call_t *)compat_43_netbsd32_oftruncate },
+ { NETBSD32_SYS_compat_43_netbsd32_ogetdirentries, 0,
+ (sy_call_t *)compat_43_netbsd32_ogetdirentries },
+ { NETBSD32_SYS_compat_43_netbsd32_ogetkerninfo, 0,
+ (sy_call_t *)compat_43_netbsd32_ogetkerninfo },
+ { NETBSD32_SYS_compat_43_netbsd32_ogethostname, 0,
+ (sy_call_t *)compat_43_netbsd32_ogethostname },
+ { NETBSD32_SYS_compat_43_netbsd32_osethostname, 0,
+ (sy_call_t *)compat_43_netbsd32_osethostname },
+ { NETBSD32_SYS_compat_43_netbsd32_sethostid, 0,
+ (sy_call_t *)compat_43_netbsd32_sethostid },
+ { NETBSD32_SYS_compat_43_netbsd32_ogetrlimit, 0,
+ (sy_call_t *)compat_43_netbsd32_ogetrlimit },
+ { NETBSD32_SYS_compat_43_netbsd32_osetrlimit, 0,
+ (sy_call_t *)compat_43_netbsd32_osetrlimit },
+ { NETBSD32_SYS_compat_43_netbsd32_killpg, 0,
+ (sy_call_t *)compat_43_netbsd32_killpg },
+ { NETBSD32_SYS_compat_43_netbsd32_ommap, 0,
+ (sy_call_t *)compat_43_netbsd32_ommap },
+ { NETBSD32_SYS_compat_43_netbsd32_oaccept, 0,
+ (sy_call_t *)compat_43_netbsd32_oaccept },
+ { NETBSD32_SYS_compat_43_netbsd32_osend, 0,
+ (sy_call_t *)compat_43_netbsd32_osend },
+ { NETBSD32_SYS_compat_43_netbsd32_orecv, 0,
+ (sy_call_t *)compat_43_netbsd32_orecv },
+ { NETBSD32_SYS_compat_43_netbsd32_orecvmsg, 0,
+ (sy_call_t *)compat_43_netbsd32_orecvmsg },
+ { compat_43_netbsd32_osendmsg, 0,
+ (sy_call_t *)compat_43_netbsd32_osendmsg },
+ { NETBSD32_SYS_compat_43_netbsd32_orecvfrom, 0,
+ (sy_call_t *)compat_43_netbsd32_orecvfrom },
+ { NETBSD32_SYS_compat_43_netbsd32_ogetsockname, 0,
+ (sy_call_t *)compat_43_netbsd32_ogetsockname },
+ { NETBSD32_SYS_compat_43_netbsd32_ogetpeername, 0,
+ (sy_call_t *)compat_43_netbsd32_ogetpeername },
+ { NETBSD32_SYS_compat_43_netbsd32_osigvec, 0,
+ (sy_call_t *)compat_43_netbsd32_osigvec },
+ { NETBSD32_SYS_compat_43_netbsd32_sigblock, 0,
+ (sy_call_t *)compat_43_netbsd32_sigblock },
+ { NETBSD32_SYS_compat_43_netbsd32_sigsetmask, 0,
+ (sy_call_t *)compat_43_netbsd32_sigsetmask },
+ {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 08:36:29 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.6 -r1.134.2.7 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.5 -r1.134.2.6 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.6 -r1.132.2.7 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.5 -r1.13.2.6 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.5 -r1.132.2.6 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.5 -r1.24.2.6 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.6 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.7
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.6 Tue Sep 11 06:12:17 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Sep 11 08:36:29 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.6 2018/09/11 06:12:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.7 2018/09/11 08:36:29 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.5 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.6
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.5 Tue Sep 11 06:12:17 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Sep 11 08:36:29 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.5 2018/09/11 06:12:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.6 2018/09/11 08:36:29 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.6 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.7
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.6 Tue Sep 11 06:12:17 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Sep 11 08:36:29 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.6 2018/09/11 06:12:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.7 2018/09/11 08:36:29 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.6 2018/09/11 06:12:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.7 2018/09/11 08:36:29 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.5 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.6
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.5 Tue Sep 11 06:12:17 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Tue Sep 11 08:36:29 2018
@@ -1,38 +1,65 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.5 2018/09/11 06:12:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.6 2018/09/11 08:36:29 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.5 2018/09/11 06:12:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.6 2018/09/11 08:36:29 pgoyette Exp $");
#include
static struct sc_autoload netbsd32_syscalls_autoload[] = {
{ NETBSD32_SYS_compat_50_netbsd32_wait4, "compat_netbsd32_50" },
+ { NETBSD32_SYS_compat_43_netbsd32_ocreat,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 08:35:28 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Insert "MODULAR compat_netbsd32_43" as neeed
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.9 -r1.120.2.10 src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.9 src/sys/compat/netbsd32/syscalls.master:1.120.2.10
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.9 Tue Sep 11 06:11:59 2018
+++ src/sys/compat/netbsd32/syscalls.master Tue Sep 11 08:35:27 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.10 2018/09/11 08:35:27 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -73,7 +73,8 @@
7 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||wait4(int pid, netbsd32_intp status, \
int options, netbsd32_rusage50p_t rusage); }
-8 COMPAT_43 { int|netbsd32||ocreat(netbsd32_charp path, \
+8 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||ocreat(netbsd32_charp path, \
mode_t mode); }
9 STD { int|netbsd32||link(netbsd32_charp path, \
netbsd32_charp link); }
@@ -91,7 +92,8 @@
18 COMPAT_20 MODULAR compat_netbsd32_20 \
{ int|netbsd32||getfsstat(netbsd32_statfsp_t buf, \
netbsd32_long bufsize, int flags); }
-19 COMPAT_43 { netbsd32_long|netbsd32||olseek(int fd, \
+19 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { netbsd32_long|netbsd32||olseek(int fd, \
netbsd32_long offset, int whence); }
20 NOARGS { pid_t|sys||getpid(void); }
21 STD { int|netbsd32||mount(netbsd32_charp type, \
@@ -127,10 +129,12 @@
netbsd32_u_long flags); }
36 NOARGS { void|sys||sync(void); }
37 STD { int|netbsd32||kill(int pid, int signum); }
-38 COMPAT_43 { int|netbsd32||stat43(netbsd32_charp path, \
+38 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||stat43(netbsd32_charp path, \
netbsd32_stat43p_t ub); }
39 NOARGS { pid_t|sys||getppid(void); }
-40 COMPAT_43 { int|netbsd32||lstat43(netbsd32_charp path, \
+40 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||lstat43(netbsd32_charp path, \
netbsd32_stat43p_t ub); }
41 STD { int|netbsd32||dup(int fd); }
42 NOARGS { int|sys||pipe(void); }
@@ -169,8 +173,10 @@
netbsd32_charpp argp, netbsd32_charpp envp); }
60 STD { mode_t|netbsd32||umask(mode_t newmask); }
61 STD { int|netbsd32||chroot(netbsd32_charp path); }
-62 COMPAT_43 { int|netbsd32||fstat43(int fd, netbsd32_stat43p_t sb); }
-63 COMPAT_43 { int|netbsd32||ogetkerninfo(int op, \
+62 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||fstat43(int fd, netbsd32_stat43p_t sb); }
+63 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||ogetkerninfo(int op, \
netbsd32_charp where, netbsd32_intp size, \
int arg); }
64 COMPAT_43 { int|sys||getpagesize(void); } ogetpagesize
@@ -183,7 +189,8 @@
68 OBSOL vwrite
69 OBSOL sbrk
70 OBSOL sstk
-71 COMPAT_43 { int|netbsd32||ommap(netbsd32_voidp addr, \
+71 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||ommap(netbsd32_voidp addr, \
netbsd32_size_t len, int prot, int flags, int fd, \
netbsd32_long pos); }
72 STD { int|netbsd32||ovadvise(int anom); } vadvise
@@ -213,9 +220,11 @@
86 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||getitimer(int which, \
netbsd32_itimerval50p_t itv); }
-87 COMPAT_43 { int|netbsd32||ogethostname(netbsd32_charp hostname, \
+87 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||ogethostname(netbsd32_charp hostname, \
u_int len); }
-88 COMPAT_43 { int|netbsd32||osethostname(netbsd32_charp hostname, \
+88 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||osethostname(netbsd32_charp hostname, \
u_int len); }
89 COMPAT_43 { int|sys||getdtablesize(void); } ogetdtablesize
90 STD { int|netbsd32||dup2(int from, int to); }
@@ -235,12 +244,15 @@
int protocol); }
98 STD { int|netbsd32||connect(int s, \
netbsd32_sockaddrp_t name, int namelen); }
-99 COMPAT_43 { int|netbsd32||oaccept(int s, netbsd32_voidp name, \
+99 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||oaccept(int s, netbsd32_voidp name, \
netbsd32_intp anamelen); }
100 STD { int|netbsd32||getpriority(int which, int who); }
-101 COMPAT_43 { int|netbsd32||osend(int s, netbsd32_voidp buf, \
+101 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||osend(int s, netbsd32_voidp buf, \
int len, int flags); }
-102 COMPAT_43 { int|netbsd32||orecv(int s, netbsd32_voidp buf, \
+102 COMPAT_43 MODULAR compat_netbsd32_43 \
+ { int|netbsd32||orecv(int s,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 06:12:18 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
And regen again
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.5 -r1.134.2.6 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.4 -r1.134.2.5 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.5 -r1.132.2.6 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.4 -r1.13.2.5 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.4 -r1.132.2.5 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.4 -r1.24.2.5 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.5 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.6
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.5 Tue Sep 11 05:48:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Sep 11 06:12:17 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.5 2018/09/11 05:48:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.6 2018/09/11 06:12:17 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -464,14 +464,14 @@
/* syscall: "netbsd32_sysarch" ret: "int" args: "int" "netbsd32_voidp" */
#define NETBSD32_SYS_netbsd32_sysarch 165
-/* syscall: "osemsys" ret: "int" args: "int" "int" "int" "int" "int" */
-#define NETBSD32_SYS_osemsys 169
+/* syscall: "compat_10_osemsys" ret: "int" args: "int" "int" "int" "int" "int" */
+#define NETBSD32_SYS_compat_10_osemsys 169
-/* syscall: "omsgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
-#define NETBSD32_SYS_omsgsys 170
+/* syscall: "compat_10_omsgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
+#define NETBSD32_SYS_compat_10_omsgsys 170
-/* syscall: "oshmsys" ret: "int" args: "int" "int" "int" "int" */
-#define NETBSD32_SYS_oshmsys 171
+/* syscall: "compat_10_oshmsys" ret: "int" args: "int" "int" "int" "int" */
+#define NETBSD32_SYS_compat_10_oshmsys 171
/* syscall: "netbsd32_pread" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_off_t" */
#define NETBSD32_SYS_netbsd32_pread 173
@@ -803,14 +803,14 @@
/* syscall: "compat_20_netbsd32_fhstatfs" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_stat50p_t" */
#define NETBSD32_SYS_compat_20_netbsd32_fhstatfs 300
-/* syscall: "netbsd32___semctl14" ret: "int" args: "int" "int" "int" "..." */
-#define NETBSD32_SYS_netbsd32___semctl14 301
+/* syscall: "compat_50_netbsd32___semctl14" ret: "int" args: "int" "int" "int" "..." */
+#define NETBSD32_SYS_compat_50_netbsd32___semctl14 301
-/* syscall: "netbsd32___msgctl13" ret: "int" args: "int" "int" "netbsd32_msqid_ds50p_t" */
-#define NETBSD32_SYS_netbsd32___msgctl13 302
+/* syscall: "compat_50_netbsd32___msgctl13" ret: "int" args: "int" "int" "netbsd32_msqid_ds50p_t" */
+#define NETBSD32_SYS_compat_50_netbsd32___msgctl13 302
-/* syscall: "netbsd32___shmctl13" ret: "int" args: "int" "int" "netbsd32_shmid_ds50p_t" */
-#define NETBSD32_SYS_netbsd32___shmctl13 303
+/* syscall: "compat_50_netbsd32___shmctl13" ret: "int" args: "int" "int" "netbsd32_shmid_ds50p_t" */
+#define NETBSD32_SYS_compat_50_netbsd32___shmctl13 303
/* syscall: "netbsd32_lchflags" ret: "int" args: "netbsd32_charp" "netbsd32_u_long" */
#define NETBSD32_SYS_netbsd32_lchflags 304
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.4 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.5
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.4 Tue Sep 11 05:48:07 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Sep 11 06:12:17 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.4 2018/09/11 05:48:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.5 2018/09/11 06:12:17 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -864,16 +864,16 @@ struct netbsd32_sysarch_args {
};
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 06:11:59 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
More over-zealousness - what was I thinking?
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.8 -r1.120.2.9 src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.8 src/sys/compat/netbsd32/syscalls.master:1.120.2.9
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.8 Tue Sep 11 05:47:52 2018
+++ src/sys/compat/netbsd32/syscalls.master Tue Sep 11 06:11:59 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.9 2018/09/11 06:11:59 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -364,13 +364,13 @@
166 UNIMPL
167 UNIMPL
168 UNIMPL
-169 STD MODULAR compat_netbsd32_sysvipc \
+169 COMPAT_10 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||semsys(int which, int a2, int a3, \
int a4, int a5); } osemsys
-170 STD MODULAR compat_netbsd32_sysvipc \
+170 COMPAT_10 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||msgsys(int which, int a2, int a3, \
int a4, int a5, int a6); } omsgsys
-171 STD MODULAR compat_netbsd32_sysvipc \
+171 COMPAT_10 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||shmsys(int which, int a2, int a3, \
int a4); } oshmsys
172 UNIMPL
@@ -664,13 +664,13 @@
300 COMPAT_20 MODULAR compat_netbsd32_20 \
{ int|netbsd32||fhstatfs(netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t buf); }
-301 STD MODULAR compat_netbsd32_sysvipc \
+301 COMPAT_50 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32|14|semctl(int semid, int semnum, \
int cmd, ... netbsd32_semun50p_t arg); }
-302 STD MODULAR compat_netbsd32_sysvipc \
+302 COMPAT_50 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32|13|msgctl(int msqid, int cmd, \
netbsd32_msqid_ds50p_t buf); }
-303 STD MODULAR compat_netbsd32_sysvipc \
+303 COMPAT_50 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32|13|shmctl(int shmid, int cmd, \
netbsd32_shmid_ds50p_t buf); }
304 STD { int|netbsd32||lchflags(netbsd32_charp path, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 05:57:15 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mqueue.c
Log Message:
Revert previous - it was wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.6.18.1 -r1.6.18.2 src/sys/compat/netbsd32/netbsd32_mqueue.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/netbsd32/netbsd32_mqueue.c
diff -u src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.1 src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.2
--- src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.1 Tue Sep 11 05:48:07 2018
+++ src/sys/compat/netbsd32/netbsd32_mqueue.c Tue Sep 11 05:57:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mqueue.c,v 1.6.18.1 2018/09/11 05:48:07 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mqueue.c,v 1.6.18.2 2018/09/11 05:57:15 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6.18.1 2018/09/11 05:48:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6.18.2 2018/09/11 05:57:15 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -328,7 +328,7 @@ netbsd32___mq_timedreceive50(struct lwp
int
compat_50_netbsd32_mq_timedsend(struct lwp *l,
-const struct netbsd32_mq_timedsend_args *uap,
+const struct compat_50_netbsd32_mq_timedsend_args *uap,
register_t *retval)
{
/* {
@@ -360,7 +360,7 @@ compat_50_netbsd32_mq_timedsend(struct l
int
compat_50_netbsd32_mq_timedreceive(struct lwp *l,
-const struct netbsd32_mq_timedreceive_args *uap,
+const struct compat_50_netbsd32_mq_timedreceive_args *uap,
register_t *retval)
{
/* {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 05:48:07 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_80.c
netbsd32_mqueue.c netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/compat/netbsd32/netbsd32_mqueue.c
cvs rdiff -u -r1.134.2.4 -r1.134.2.5 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.3 -r1.134.2.4 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.4 -r1.132.2.5 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.3 -r1.13.2.4 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.3 -r1.132.2.4 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.3 -r1.24.2.4 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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/netbsd32/netbsd32_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.2
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.1 Mon Sep 10 22:50:51 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Tue Sep 11 05:48:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.1 2018/09/10 22:50:51 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.2 2018/09/11 05:48:07 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.1 2018/09/10 22:50:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.2 2018/09/11 05:48:07 pgoyette Exp $");
#include
#include
@@ -37,12 +37,18 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+#include
+
#include
#include
#include
#include
#ifdef COMPAT_80
+
+int netbsd32_80_modctl(struct lwp *, const struct netbsd32_modctl_args *,
+ register_t *);
+
static int
modctl32_handle_ostat(int cmd, struct netbsd32_iovec *iov, void *arg)
{
@@ -147,9 +153,7 @@ netbsd32_80_modctl(struct lwp *lwp, cons
syscallarg(int) cmd;
syscallarg(netbsd32_voidp) arg;
} */
- char buf[MAXMODNAME];
struct netbsd32_iovec iov;
- struct netbsd32_modctl_load ml;
int error;
void *arg;
#ifdef MODULAR
@@ -197,5 +201,3 @@ static int (*orig_netbsd32_80_modctl)(st
}
}
#endif /* COMPAT_80 */
-
-vec_compat32_80_modctl = compat32_80_modctl_compat_stub;
Index: src/sys/compat/netbsd32/netbsd32_mqueue.c
diff -u src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6 src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.1
--- src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6 Tue Dec 1 23:56:43 2015
+++ src/sys/compat/netbsd32/netbsd32_mqueue.c Tue Sep 11 05:48:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mqueue.c,v 1.6 2015/12/01 23:56:43 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mqueue.c,v 1.6.18.1 2018/09/11 05:48:07 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6 2015/12/01 23:56:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6.18.1 2018/09/11 05:48:07 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -328,7 +328,7 @@ netbsd32___mq_timedreceive50(struct lwp
int
compat_50_netbsd32_mq_timedsend(struct lwp *l,
-const struct compat_50_netbsd32_mq_timedsend_args *uap,
+const struct netbsd32_mq_timedsend_args *uap,
register_t *retval)
{
/* {
@@ -360,7 +360,7 @@ compat_50_netbsd32_mq_timedsend(struct l
int
compat_50_netbsd32_mq_timedreceive(struct lwp *l,
-const struct compat_50_netbsd32_mq_timedreceive_args *uap,
+const struct netbsd32_mq_timedreceive_args *uap,
register_t *retval)
{
/* {
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.4 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.5
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.4 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Sep 11 05:48:07 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.4 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.5 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -569,8 +569,8 @@
/* syscall:
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 05:47:52 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Don't be overzealous with changes! Return a few syscalls to their
original COMPAT_xx status (rather than STD)
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.7 -r1.120.2.8 src/sys/compat/netbsd32/syscalls.master
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/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.7 src/sys/compat/netbsd32/syscalls.master:1.120.2.8
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.7 Tue Sep 11 01:45:19 2018
+++ src/sys/compat/netbsd32/syscalls.master Tue Sep 11 05:47:52 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -461,7 +461,7 @@
218 UNIMPL
219 UNIMPL
; System calls 220-300 are reserved for use by NetBSD
-220 STD MODULAR compat_netbsd32_sysvipc \
+220 COMPAT_14 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||__semctl(int semid, int semnum, \
int cmd, netbsd32_semunu_t arg); }
221 STD MODULAR compat_netbsd32_sysvipc \
@@ -472,7 +472,7 @@
netbsd32_sembufp_t sops, netbsd32_size_t nsops); }
223 STD MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||semconfig(int flag); }
-224 STD MODULAR compat_netbsd32_sysvipc \
+224 COMPAT_14 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||msgctl(int msqid, int cmd, \
netbsd32_msqid_ds14p_t buf); }
225 STD MODULAR compat_netbsd32_sysvipc \
@@ -487,7 +487,7 @@
228 STD MODULAR compat_netbsd32_sysvipc \
{ netbsd32_voidp|netbsd32||shmat(int shmid, \
netbsd32_voidp shmaddr, int shmflg); }
-229 STD MODULAR compat_netbsd32_sysvipc \
+229 COMPAT_14 MODULAR compat_netbsd32_sysvipc \
{ int|netbsd32||shmctl(int shmid, int cmd, \
netbsd32_shmid_dsp_t buf); }
230 STD MODULAR compat_netbsd32_sysvipc \
@@ -579,13 +579,13 @@
{ netbsd32_ssize_t|netbsd32||mq_receive(mqd_t mqdes, \
netbsd32_charp msg_ptr, \
netbsd32_size_t msg_len, netbsd32_uintp msg_prio); }
-265 STD MODULAR compat_netbsd32_mqueue \
+265 COMPAT_50 MODULAR compat_netbsd32_mqueue \
{ int|netbsd32||mq_timedsend(mqd_t mqdes, \
const netbsd32_charp msg_ptr, \
netbsd32_size_t msg_len, \
unsigned msg_prio, \
const netbsd32_timespec50p_t abs_timeout); }
-266 STD MODULAR compat_netbsd32_mqueue \
+266 COMPAT_50 MODULAR compat_netbsd32_mqueue \
{ netbsd32_ssize_t|netbsd32||mq_timedreceive( \
mqd_t mqdes, \
netbsd32_charp msg_ptr, netbsd32_size_t msg_len, \
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 05:00:42 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: files.netbsd32
netbsd32_compat_09.c netbsd32_compat_12.c netbsd32_compat_13.c
netbsd32_compat_20.c netbsd32_compat_30.c netbsd32_compat_50.c
netbsd32_compat_60.c
Log Message:
Also need to declare the emul_netbsd32 !
To generate a diff of this commit:
cvs rdiff -u -r1.39.14.1 -r1.39.14.2 src/sys/compat/netbsd32/files.netbsd32
cvs rdiff -u -r1.18.86.3 -r1.18.86.4 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.5 -r1.33.36.6 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.4 -r1.26.28.5 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.6 -r1.36.10.7 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.5 -r1.31.16.6 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.32.16.4 -r1.32.16.5 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.4 -r1.3.2.5 src/sys/compat/netbsd32/netbsd32_compat_60.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/netbsd32/files.netbsd32
diff -u src/sys/compat/netbsd32/files.netbsd32:1.39.14.1 src/sys/compat/netbsd32/files.netbsd32:1.39.14.2
--- src/sys/compat/netbsd32/files.netbsd32:1.39.14.1 Wed Mar 21 02:01:34 2018
+++ src/sys/compat/netbsd32/files.netbsd32 Tue Sep 11 05:00:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.netbsd32,v 1.39.14.1 2018/03/21 02:01:34 pgoyette Exp $
+# $NetBSD: files.netbsd32,v 1.39.14.2 2018/09/11 05:00:42 pgoyette Exp $
#
# config file description for machine-independent netbsd32 compat code.
# included by ports that need it.
@@ -45,3 +45,4 @@ file compat/netbsd32/netbsd32_rndpseudo_
file compat/netbsd32/netbsd32_compat_50_sysv.c compat_netbsd32 & compat_50 &
(sysvmsg | sysvsem | sysvshm)
file compat/netbsd32/netbsd32_compat_60.c compat_netbsd32 & compat_60
+file compat/netbsd32/netbsd32_compat_80.c compat_netbsd32 & compat_80
Index: src/sys/compat/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.3 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.4
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.3 Tue Sep 11 04:53:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 05:00:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.3 2018/09/11 04:53:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.3 2018/09/11 04:53:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.4 2018/09/11 05:00:42 pgoyette Exp $");
#include
#include
@@ -46,6 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+extern struct emul emul_netbsd32;
+
int
compat_09_netbsd32_ogetdomainname(struct lwp *l, const struct compat_09_netbsd32_ogetdomainname_args *uap, register_t *retval)
{
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.5 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.6
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.5 Tue Sep 11 04:53:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 05:00:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.5 2018/09/11 04:53:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.5 2018/09/11 04:53:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.6 2018/09/11 05:00:42 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -54,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+extern struct emul emul_netbsd32;
+
static void netbsd32_stat12_to_netbsd32(struct stat12 *,
struct netbsd32_stat12 *);
Index: src/sys/compat/netbsd32/netbsd32_compat_13.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.4 src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.5
--- src/sys/compat/netbsd32/netbsd32_compat_13.c:1.26.28.4 Tue Sep 11 04:53:42 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_13.c Tue Sep 11 05:00:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.4 2018/09/11 04:53:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_13.c,v 1.26.28.5 2018/09/11 05:00:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.26.28.4 2018/09/11 04:53:42 pgoyette Exp $");
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 04:53:42 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_09.c
netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_20.c
netbsd32_compat_30.c netbsd32_compat_50.c netbsd32_compat_60.c
netbsd32_mod.c netbsd32_module.c
Log Message:
Install the syscalls into the netbsd32 table, not the default/native table.
To generate a diff of this commit:
cvs rdiff -u -r1.18.86.2 -r1.18.86.3 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.4 -r1.33.36.5 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.3 -r1.26.28.4 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.5 -r1.36.10.6 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.4 -r1.31.16.5 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.32.16.3 -r1.32.16.4 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/sys/compat/netbsd32/netbsd32_compat_60.c
cvs rdiff -u -r1.13.16.4 -r1.13.16.5 src/sys/compat/netbsd32/netbsd32_mod.c
cvs rdiff -u -r1.6.2.4 -r1.6.2.5 src/sys/compat/netbsd32/netbsd32_module.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/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.2 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.3
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.2 Tue Sep 11 02:53:56 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 04:53:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.3 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.3 2018/09/11 04:53:42 pgoyette Exp $");
#include
#include
@@ -40,6 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+#include
+
#include
#include
#include
@@ -87,13 +89,13 @@ compat_09_netbsd32_uname(struct lwp *l,
NETBSD32TOP_UAP(name, struct outsname);
return (compat_09_sys_uname(l, , retval));
}
-NETBSD32_SYS_compat_30_netbsd32_fhstat
+
static struct syscall_package compat_netbsd32_09_syscalls[] = {
-{ NETBSD32_SYS_compat_30_netbsd32_ogetdomainname, 0,
+{ NETBSD32_SYS_compat_09_netbsd32_ogetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_ogetdomainname },
-{ NETBSD32_SYS_compat_30_netbsd32_osetdomainname, 0,
+{ NETBSD32_SYS_compat_09_netbsd32_osetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_osetdomainname },
-{ NETBSD32_SYS_compat_30_netbsd32_ouname, 0,
+{ NETBSD32_SYS_compat_09_netbsd32_uname, 0,
(sy_call_t *)compat_09_netbsd32_uname },
{ 0, 0, NULL }
};
@@ -101,15 +103,17 @@ static struct syscall_package compat_net
MODULE(MODULE_CLASS_EXEC, compat_netbsd32_09, "compat_netbsd32,compat_09");
static int
-compat_netbsd32_09_modcmd(modcmt_t cmd, void *(arg)
+compat_netbsd32_09_modcmd(modcmd_t cmd, void *arg)
{
switch (cmd) {
case MODULE_CMD_INIT:
- return syscall_establish(NULL, compat_netbsd32_09_syscalls);
+ return syscall_establish(_netbsd32,
+ compat_netbsd32_09_syscalls);
case MODULE_CMD_FINI:
- return syscall_disestablish(NULL, compat_netbsd32_09_syscalls);
+ return syscall_disestablish(_netbsd32,
+ compat_netbsd32_09_syscalls);
default:
return ENOTTY;
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.4 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.5
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.4 Tue Sep 11 02:53:56 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 04:53:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.5 2018/09/11 04:53:42 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.5 2018/09/11 04:53:42 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -216,8 +216,8 @@ static struct syscall_package compat_net
(sy_call_t *)compat_12_netbsd32_reboot },
{ NETBSD32_SYS_compat_12_netbsd32_msync, 0,
(sy_call_t *)compat_12_netbsd32_msync },
- { NETBSD32_SYS_compat_12_netbsd32_swapon, 0,
- (sy_call_t *)compat_12_netbsd32_swapon },
+ {
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Tue Sep 11 02:53:56 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_09.c
netbsd32_compat_12.c netbsd32_compat_13.c netbsd32_compat_20.c
netbsd32_compat_30.c netbsd32_compat_50.c netbsd32_compat_60.c
Log Message:
Use netbsd32 syscall names in the establish/disestablish tables
To generate a diff of this commit:
cvs rdiff -u -r1.18.86.1 -r1.18.86.2 \
src/sys/compat/netbsd32/netbsd32_compat_09.c
cvs rdiff -u -r1.33.36.3 -r1.33.36.4 \
src/sys/compat/netbsd32/netbsd32_compat_12.c
cvs rdiff -u -r1.26.28.2 -r1.26.28.3 \
src/sys/compat/netbsd32/netbsd32_compat_13.c
cvs rdiff -u -r1.36.10.4 -r1.36.10.5 \
src/sys/compat/netbsd32/netbsd32_compat_20.c
cvs rdiff -u -r1.31.16.3 -r1.31.16.4 \
src/sys/compat/netbsd32/netbsd32_compat_30.c
cvs rdiff -u -r1.32.16.2 -r1.32.16.3 \
src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/compat/netbsd32/netbsd32_compat_60.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/netbsd32/netbsd32_compat_09.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.1 src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.2
--- src/sys/compat/netbsd32/netbsd32_compat_09.c:1.18.86.1 Mon Sep 10 09:54:47 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_09.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.1 2018/09/10 09:54:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.1 2018/09/10 09:54:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.18.86.2 2018/09/11 02:53:56 pgoyette Exp $");
#include
#include
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+#include
#include
int
@@ -86,13 +87,14 @@ compat_09_netbsd32_uname(struct lwp *l,
NETBSD32TOP_UAP(name, struct outsname);
return (compat_09_sys_uname(l, , retval));
}
-
+NETBSD32_SYS_compat_30_netbsd32_fhstat
static struct syscall_package compat_netbsd32_09_syscalls[] = {
-{ NETBSD32_SYS_ogetdomainname, 0,
+{ NETBSD32_SYS_compat_30_netbsd32_ogetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_ogetdomainname },
-{ NETBSD32_SYS_osetdomainname, 0,
+{ NETBSD32_SYS_compat_30_netbsd32_osetdomainname, 0,
(sy_call_t *)compat_09_netbsd32_osetdomainname },
-{ NETBSD32_SYS_ouname, 0, (sy_call_t *)compat_09_netbsd32_uname },
+{ NETBSD32_SYS_compat_30_netbsd32_ouname, 0,
+ (sy_call_t *)compat_09_netbsd32_uname },
{ 0, 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_compat_12.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.3 src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.4
--- src/sys/compat/netbsd32/netbsd32_compat_12.c:1.33.36.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_12.c Tue Sep 11 02:53:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.3 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.33.36.4 2018/09/11 02:53:56 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include
#include
+#include
#include
static void netbsd32_stat12_to_netbsd32(struct stat12 *,
@@ -211,19 +212,19 @@ compat_12_netbsd32_getdirentries(struct
}
static struct syscall_package compat_netbsd32_12_syscalls[] = {
- { NETBSD32_SYS_reboot, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_reboot, 0,
(sy_call_t *)compat_12_netbsd32_reboot },
- { NETBSD32_SYS_msync, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_msync, 0,
(sy_call_t *)compat_12_netbsd32_msync },
- { NETBSD32_SYS_swapon, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_swapon, 0,
(sy_call_t *)compat_12_netbsd32_swapon },
- { NETBSD32_SYS_stat12, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_stat12, 0,
(sy_call_t *)compat_12_netbsd32_stat12 },
- { NETBSD32_SYS_fstat12, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_fstat12, 0,
(sy_call_t *)compat_12_netbsd32_fstat12 },
- { NETBSD32_SYS_lstat12, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_lstat12, 0,
(sy_call_t *)compat_12_netbsd32_lstat12 },
- { NETBSD32_SYS_getdirentries, 0,
+ { NETBSD32_SYS_compat_12_netbsd32_getdirentries, 0,
(sy_call_t *)compat_12_netbsd32_getdirentries },
{ 0, 0, NULL }
};
Index:
