Module Name: src
Committed By: pgoyette
Date: Fri Mar 30 11:18:34 UTC 2018
Modified Files:
src/distrib/sets/lists/modules [pgoyette-compat]: mi
src/sys/compat/common [pgoyette-compat]: compat_mod.c compat_mod.h
files.common kern_sig_13.c
src/sys/modules [pgoyette-compat]: Makefile
Added Files:
src/sys/compat/common [pgoyette-compat]: compat_13_mod.c
src/sys/modules/compat_13 [pgoyette-compat]: Makefile
Log Message:
Add compat_13 module
To generate a diff of this commit:
cvs rdiff -u -r1.114.2.11 -r1.114.2.12 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/compat_13_mod.c
cvs rdiff -u -r1.24.14.27 -r1.24.14.28 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r1.1.42.15 -r1.1.42.16 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.1.2.27 -r1.1.2.28 src/sys/compat/common/files.common
cvs rdiff -u -r1.20 -r1.20.56.1 src/sys/compat/common/kern_sig_13.c
cvs rdiff -u -r1.202.2.15 -r1.202.2.16 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_13/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.114.2.11 src/distrib/sets/lists/modules/mi:1.114.2.12
--- src/distrib/sets/lists/modules/mi:1.114.2.11 Fri Mar 30 10:09:07 2018
+++ src/distrib/sets/lists/modules/mi Fri Mar 30 11:18:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114.2.11 2018/03/30 10:09:07 pgoyette Exp $
+# $NetBSD: mi,v 1.114.2.12 2018/03/30 11:18:34 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -68,6 +68,8 @@
./@MODULEDIR@/coda5/coda5.kmod base-kernel-modules kmod
./@MODULEDIR@/compat base-kernel-modules kmod
./@MODULEDIR@/compat/compat.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_13 base-kernel-modules kmod
+./@MODULEDIR@/compat_13/compat_13.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_14 base-kernel-modules kmod
./@MODULEDIR@/compat_14/compat_14.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_16 base-kernel-modules kmod
Index: src/sys/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.27 src/sys/compat/common/compat_mod.c:1.24.14.28
--- src/sys/compat/common/compat_mod.c:1.24.14.27 Fri Mar 30 10:09:07 2018
+++ src/sys/compat/common/compat_mod.c Fri Mar 30 11:18:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.24.14.27 2018/03/30 10:09:07 pgoyette Exp $ */
+/* $NetBSD: compat_mod.c,v 1.24.14.28 2018/03/30 11:18:34 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.27 2018/03/30 10:09:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.28 2018/03/30 11:18:34 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -140,15 +140,6 @@ static const struct syscall_package comp
{ SYS_compat_12_stat12, 0, (sy_call_t *)compat_12_sys_stat },
#endif
-#if defined(COMPAT_13)
- { SYS_compat_13_sigaction13, 0, (sy_call_t *)compat_13_sys_sigaction },
- { SYS_compat_13_sigaltstack13, 0, (sy_call_t *)compat_13_sys_sigaltstack },
- { SYS_compat_13_sigpending13, 0, (sy_call_t *)compat_13_sys_sigpending },
- { SYS_compat_13_sigprocmask13, 0, (sy_call_t *)compat_13_sys_sigprocmask },
- { SYS_compat_13_sigreturn13, 0, (sy_call_t *)compat_13_sys_sigreturn },
- { SYS_compat_13_sigsuspend13, 0, (sy_call_t *)compat_13_sys_sigsuspend },
-#endif
-
{ 0, 0, NULL },
};
@@ -180,10 +171,10 @@ struct compat_init_fini {
#ifdef COMPAT_14
{ compat_14_init, compat_14_fini },
#endif
-#if 0 /* NOT YET */
#ifdef COMPAT_13
{ compat_13_init, compat_13_fini },
#endif
+#if 0 /* NOT YET */
#ifdef COMPAT_12
{ compat_12_init, compat_12_fini },
#endif
@@ -242,9 +233,6 @@ compat_modcmd(modcmd_t cmd, void *arg)
* XXX */
#endif
#endif /* XXX NOTYET */
-#ifdef COMPAT_13
- uvm_13_init();
-#endif
#ifdef COMPAT_10
vfs_syscalls_10_init();
#endif
@@ -255,9 +243,6 @@ compat_modcmd(modcmd_t cmd, void *arg)
#ifdef COMPAT_10
vfs_syscalls_10_fini();
#endif
-#ifdef COMPAT_13
- uvm_13_fini();
-#endif
/* Unlink the system calls. */
error = syscall_disestablish(NULL, compat_syscalls);
if (error != 0) {
Index: src/sys/compat/common/compat_mod.h
diff -u src/sys/compat/common/compat_mod.h:1.1.42.15 src/sys/compat/common/compat_mod.h:1.1.42.16
--- src/sys/compat/common/compat_mod.h:1.1.42.15 Fri Mar 30 10:09:07 2018
+++ src/sys/compat/common/compat_mod.h Fri Mar 30 11:18:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.h,v 1.1.42.15 2018/03/30 10:09:07 pgoyette Exp $ */
+/* $NetBSD: compat_mod.h,v 1.1.42.16 2018/03/30 11:18:34 pgoyette Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -130,4 +130,13 @@ void rtsock_14_init(void);
void rtsock_14_fini(void);
#endif
+#ifdef COMPAT_13
+int compat_13_init(void);
+int compat_13_fini(void);
+int kern_sig_13_init(void);
+int kern_sig_13_fini(void);
+void uvm_13_init(void);
+void uvm_13_fini(void);
+#endif
+
#endif /* !_COMPAT_MOD_H_ */
Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.27 src/sys/compat/common/files.common:1.1.2.28
--- src/sys/compat/common/files.common:1.1.2.27 Fri Mar 30 10:09:07 2018
+++ src/sys/compat/common/files.common Fri Mar 30 11:18:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.common,v 1.1.2.27 2018/03/30 10:09:07 pgoyette Exp $
+# $NetBSD: files.common,v 1.1.2.28 2018/03/30 11:18:34 pgoyette Exp $
#
# Generic files, used by all compat options.
@@ -34,6 +34,7 @@ file compat/common/vfs_syscalls_12.c co
file compat/common/vm_12.c compat_12
# Compatibility code for NetBSD 1.3
+file compat/common/compat_13_mod.c compat_13
file compat/common/kern_sig_13.c compat_13
file compat/common/uvm_13.c compat_13
Index: src/sys/compat/common/kern_sig_13.c
diff -u src/sys/compat/common/kern_sig_13.c:1.20 src/sys/compat/common/kern_sig_13.c:1.20.56.1
--- src/sys/compat/common/kern_sig_13.c:1.20 Wed Jan 19 10:21:16 2011
+++ src/sys/compat/common/kern_sig_13.c Fri Mar 30 11:18:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig_13.c,v 1.20 2011/01/19 10:21:16 tsutsui Exp $ */
+/* $NetBSD: kern_sig_13.c,v 1.20.56.1 2018/03/30 11:18:34 pgoyette Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.20 2011/01/19 10:21:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.20.56.1 2018/03/30 11:18:34 pgoyette Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -38,6 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig_13.
#include <sys/signalvar.h>
#include <sys/systm.h>
+#include <sys/syscall.h>
+#include <sys/syscallvar.h>
#include <sys/syscallargs.h>
#include <machine/limits.h>
@@ -46,6 +48,22 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig_13.
#include <compat/sys/signalvar.h>
#include <compat/common/compat_util.h>
#include <compat/common/compat_sigaltstack.h>
+#include <compat/common/compat_mod.h>
+
+static const struct syscall_package kern_sig_13_syscalls[] = {
+ { SYS_compat_13_sigaction13, 0, (sy_call_t *)compat_13_sys_sigaction },
+ { SYS_compat_13_sigaltstack13, 0,
+ (sy_call_t *)compat_13_sys_sigaltstack },
+ { SYS_compat_13_sigpending13, 0,
+ (sy_call_t *)compat_13_sys_sigpending },
+ { SYS_compat_13_sigprocmask13, 0,
+ (sy_call_t *)compat_13_sys_sigprocmask },
+ { SYS_compat_13_sigsuspend13, 0,
+ (sy_call_t *)compat_13_sys_sigsuspend },
+ /* compat_13_sigreturn13 is in MD code! */
+ { SYS_compat_13_sigreturn13, 0, (sy_call_t *)compat_13_sys_sigreturn },
+ { 0, 0, NULL }
+};
void
native_sigset13_to_sigset(const sigset13_t *oss, sigset_t *ss)
@@ -173,3 +191,17 @@ compat_13_sys_sigsuspend(struct lwp *l,
native_sigset13_to_sigset(&ess, &bss);
return (sigsuspend1(l, &bss));
}
+
+int
+kern_sig_13_init(void)
+{
+
+ return syscall_establish(NULL, kern_sig_13_syscalls);
+}
+
+int
+kern_sig_13_fini(void)
+{
+
+ return syscall_disestablish(NULL, kern_sig_13_syscalls);
+}
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.15 src/sys/modules/Makefile:1.202.2.16
--- src/sys/modules/Makefile:1.202.2.15 Fri Mar 30 10:09:08 2018
+++ src/sys/modules/Makefile Fri Mar 30 11:18:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.15 2018/03/30 10:09:08 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.16 2018/03/30 11:18:34 pgoyette Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
SUBDIR+= compat compat_80 compat_70 compat_60 compat_50
SUBDIR+= compat_40 compat_30 compat_20 compat_16 compat_14
-#SUBDIR+= compat_13 compat_12 compat_10 compat_09
+SUBDIR+= compat_13 #compat_12 compat_10 compat_09
SUBDIR+= compat_ossaudio
SUBDIR+= compat_sysv
Added files:
Index: src/sys/compat/common/compat_13_mod.c
diff -u /dev/null src/sys/compat/common/compat_13_mod.c:1.1.2.1
--- /dev/null Fri Mar 30 11:18:34 2018
+++ src/sys/compat/common/compat_13_mod.c Fri Mar 30 11:18:34 2018
@@ -0,0 +1,97 @@
+/* $NetBSD: compat_13_mod.c,v 1.1.2.1 2018/03/30 11:18:34 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software developed for The NetBSD Foundation
+ * by Paul Goyette
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Linkage for the compat module: spaghetti.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: compat_13_mod.c,v 1.1.2.1 2018/03/30 11:18:34 pgoyette Exp $");
+
+#include <sys/systm.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+#include <sys/syscall.h>
+#include <sys/syscallvar.h>
+#include <sys/syscallargs.h>
+
+#include <compat/common/compat_util.h>
+#include <compat/common/compat_mod.h>
+
+int
+compat_13_init(void)
+{
+ int error;
+
+ error = kern_sig_13_init();
+ if (error != 0)
+ return error;
+
+ uvm_13_init();
+ return 0;
+}
+
+int
+compat_13_fini(void)
+{
+ int error;
+
+ uvm_13_fini();
+ error = kern_sig_13_fini();
+ if (error != 0) {
+ uvm_13_init();
+ return error;
+ }
+
+ return 0;
+}
+
+#ifdef _MODULE
+
+#define REQD_13_1 "compat_70,compat_60,compat_50,compat_40,"
+#define REQD_13_2 "compat_30,compat_20,compat_16,compat_14"
+
+MODULE(MODULE_CLASS_EXEC, compat_13, REQD_13_1 REQD_13_2);
+
+static int
+compat_13_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ return compat_13_init();
+ case MODULE_CMD_FINI:
+ return compat_13_init();
+ default:
+ return ENOTTY;
+ }
+}
+#endif
Index: src/sys/modules/compat_13/Makefile
diff -u /dev/null src/sys/modules/compat_13/Makefile:1.1.2.1
--- /dev/null Fri Mar 30 11:18:34 2018
+++ src/sys/modules/compat_13/Makefile Fri Mar 30 11:18:34 2018
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/03/30 11:18:34 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_13
+
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_13_mod.c
+SRCS+= uvm_13.c kern_sig_13.c
+
+
+.include <bsd.kmodule.mk>
