re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
OK, things are more sane now. I reverted this change, since it was totally unnecessary. I need to get more sleep before doing some of these things. :) Thanks for keeping me honest! On Thu, 24 Jan 2019, Paul Goyette wrote: Just for sanity's sake, I will take another look at this change and see if there's another way to handle it. On Thu, 24 Jan 2019, Paul Goyette wrote: On Thu, 24 Jan 2019, matthew green wrote: 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 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. In this case the symbol is defined as __weak and might not exist. So we use a hook function to return a value if the hook has been set, or a default value if the hook has not been set. The hook's struct itself is always present/allocated. I suppose I could have avoided the hook by simply having another machine32_ptr variable, rather than a hook function. But I wasn't totally clear on whether there were any race conditions during a module unload which could result in retrieving a pointer to a value which just got removed from memory. Of course, if we had a reasonable way of dealing with weak symbols, this mess would not be needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++ +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++ +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
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.
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,
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Just for sanity's sake, I will take another look at this change and see if there's another way to handle it. On Thu, 24 Jan 2019, Paul Goyette wrote: On Thu, 24 Jan 2019, matthew green wrote: 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 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. In this case the symbol is defined as __weak and might not exist. So we use a hook function to return a value if the hook has been set, or a default value if the hook has not been set. The hook's struct itself is always present/allocated. I suppose I could have avoided the hook by simply having another machine32_ptr variable, rather than a hook function. But I wasn't totally clear on whether there were any race conditions during a module unload which could result in retrieving a pointer to a value which just got removed from memory. Of course, if we had a reasonable way of dealing with weak symbols, this mess would not be needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++ +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
re: CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
On Thu, 24 Jan 2019, matthew green wrote: 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 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. In this case the symbol is defined as __weak and might not exist. So we use a hook function to return a value if the hook has been set, or a default value if the hook has not been set. The hook's struct itself is always present/allocated. I suppose I could have avoided the hook by simply having another machine32_ptr variable, rather than a hook function. But I wasn't totally clear on whether there were any race conditions during a module unload which could result in retrieving a pointer to a value which just got removed from memory. Of course, if we had a reasonable way of dealing with weak symbols, this mess would not be needed. +--+--++ | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee dot com | | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd dot org | +--+--++
re: 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 hm. why does the module need to use the hook? doesn't it know the value internally, since it has to publish it via the hook? i don't understand the value of using hooks inside the publisher. they are useful for external consumers, i thought. .mrg.
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: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.
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.
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 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.
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.
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.
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/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.
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.
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: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.
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: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.
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 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.
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/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.
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/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.
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/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.
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: 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.
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.
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 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.
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.
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/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.
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: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.
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.
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 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.
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.
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/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.
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/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.
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.
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: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.
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.
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: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.
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.
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: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.
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: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.
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/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.
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.
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: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.
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/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.
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.
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/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.
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: 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.
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/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.
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.
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: 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.
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 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.
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: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.
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 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.
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: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.
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.
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.
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 }
};
