Module Name: src
Committed By: pgoyette
Date: Sat Mar 31 09:17:35 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_xxx_12.c vfs_syscalls_12.c vm_12.c
src/sys/modules [pgoyette-compat]: Makefile
Added Files:
src/sys/compat/common [pgoyette-compat]: compat_12_mod.c
src/sys/modules/compat_12 [pgoyette-compat]: Makefile
Log Message:
create the compat_12 module
To generate a diff of this commit:
cvs rdiff -u -r1.114.2.13 -r1.114.2.14 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/compat_12_mod.c
cvs rdiff -u -r1.24.14.29 -r1.24.14.30 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r1.1.42.16 -r1.1.42.17 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/sys/compat/common/files.common
cvs rdiff -u -r1.15 -r1.15.56.1 src/sys/compat/common/kern_xxx_12.c
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/compat/common/vfs_syscalls_12.c
cvs rdiff -u -r1.20 -r1.20.56.1 src/sys/compat/common/vm_12.c
cvs rdiff -u -r1.202.2.17 -r1.202.2.18 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_12/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.13 src/distrib/sets/lists/modules/mi:1.114.2.14
--- src/distrib/sets/lists/modules/mi:1.114.2.13 Fri Mar 30 23:57:59 2018
+++ src/distrib/sets/lists/modules/mi Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114.2.13 2018/03/30 23:57:59 pgoyette Exp $
+# $NetBSD: mi,v 1.114.2.14 2018/03/31 09:17:35 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -70,6 +70,8 @@
./@MODULEDIR@/compat/compat.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_util base-kernel-modules kmod
./@MODULEDIR@/compat_util/compat_util.kmod base-kernel-modules kmod
+./@MODULEDIR@/compat_12 base-kernel-modules kmod
+./@MODULEDIR@/compat_12/compat_12.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
Index: src/sys/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24.14.29 src/sys/compat/common/compat_mod.c:1.24.14.30
--- src/sys/compat/common/compat_mod.c:1.24.14.29 Fri Mar 30 11:29:53 2018
+++ src/sys/compat/common/compat_mod.c Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.24.14.29 2018/03/30 11:29:53 pgoyette Exp $ */
+/* $NetBSD: compat_mod.c,v 1.24.14.30 2018/03/31 09:17:35 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.29 2018/03/30 11:29:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24.14.30 2018/03/31 09:17:35 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -130,16 +130,6 @@ static const struct syscall_package comp
{ SYS_compat_09_ouname, 0, (sy_call_t *)compat_09_sys_uname },
#endif
-#if defined(COMPAT_12)
- { SYS_compat_12_fstat12, 0, (sy_call_t *)compat_12_sys_fstat },
- { SYS_compat_12_getdirentries, 0, (sy_call_t *)compat_12_sys_getdirentries },
- { SYS_compat_12_lstat12, 0, (sy_call_t *)compat_12_sys_lstat },
- { SYS_compat_12_msync, 0, (sy_call_t *)compat_12_sys_msync },
- { SYS_compat_12_oreboot, 0, (sy_call_t *)compat_12_sys_reboot },
- { SYS_compat_12_oswapon, 0, (sy_call_t *)compat_12_sys_swapon },
- { SYS_compat_12_stat12, 0, (sy_call_t *)compat_12_sys_stat },
-#endif
-
{ 0, 0, NULL },
};
@@ -174,10 +164,10 @@ struct compat_init_fini {
#ifdef COMPAT_13
{ compat_13_init, compat_13_fini },
#endif
-#if 0 /* NOT YET */
#ifdef COMPAT_12
{ compat_12_init, compat_12_fini },
#endif
+#if 0 /* NOT YET */
#ifdef COMPAT_10
{ compat_10_init, compat_10_fini },
#endif
Index: src/sys/compat/common/compat_mod.h
diff -u src/sys/compat/common/compat_mod.h:1.1.42.16 src/sys/compat/common/compat_mod.h:1.1.42.17
--- src/sys/compat/common/compat_mod.h:1.1.42.16 Fri Mar 30 11:18:34 2018
+++ src/sys/compat/common/compat_mod.h Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.h,v 1.1.42.16 2018/03/30 11:18:34 pgoyette Exp $ */
+/* $NetBSD: compat_mod.h,v 1.1.42.17 2018/03/31 09:17:35 pgoyette Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -139,4 +139,15 @@ void uvm_13_init(void);
void uvm_13_fini(void);
#endif
+#ifdef COMPAT_12
+int compat_12_init(void);
+int compat_12_fini(void);
+int kern_xxx_12_init(void);
+int kern_xxx_12_fini(void);
+int vm_12_init(void);
+int vm_12_fini(void);
+int vfs_syscalls_12_init(void);
+int vfs_syscalls_12_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.28 src/sys/compat/common/files.common:1.1.2.29
--- src/sys/compat/common/files.common:1.1.2.28 Fri Mar 30 11:18:34 2018
+++ src/sys/compat/common/files.common Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.common,v 1.1.2.28 2018/03/30 11:18:34 pgoyette Exp $
+# $NetBSD: files.common,v 1.1.2.29 2018/03/31 09:17:35 pgoyette Exp $
#
# Generic files, used by all compat options.
@@ -29,6 +29,7 @@ file compat/common/kern_info_09.c compa
file compat/common/vfs_syscalls_10.c compat_10
# Compatibility code for NetBSD 1.2
+file compat/common/compat_12_mod.c compat_12
file compat/common/kern_xxx_12.c compat_12
file compat/common/vfs_syscalls_12.c compat_12
file compat/common/vm_12.c compat_12
Index: src/sys/compat/common/kern_xxx_12.c
diff -u src/sys/compat/common/kern_xxx_12.c:1.15 src/sys/compat/common/kern_xxx_12.c:1.15.56.1
--- src/sys/compat/common/kern_xxx_12.c:1.15 Wed Jan 19 10:21:16 2011
+++ src/sys/compat/common/kern_xxx_12.c Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_xxx_12.c,v 1.15 2011/01/19 10:21:16 tsutsui Exp $ */
+/* $NetBSD: kern_xxx_12.c,v 1.15.56.1 2018/03/31 09:17:35 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,20 +33,28 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_xxx_12.c,v 1.15 2011/01/19 10:21:16 tsutsui Exp $");
-
-/*#ifdef COMPAT_12*/
+__KERNEL_RCSID(0, "$NetBSD: kern_xxx_12.c,v 1.15.56.1 2018/03/31 09:17:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/reboot.h>
+#include <sys/syscall.h>
+#include <sys/syscallvar.h>
#include <sys/syscallargs.h>
#include <sys/kauth.h>
+#include <compat/common/compat_mod.h>
+
+static const struct syscall_package kern_xxx_12_syscalls[] = {
+ { SYS_compat_12_oreboot, 0, (sy_call_t *)compat_12_sys_reboot },
+ { 0, 0, NULL }
+};
+
/* ARGSUSED */
int
-compat_12_sys_reboot(struct lwp *l, const struct compat_12_sys_reboot_args *uap, register_t *retval)
+compat_12_sys_reboot(struct lwp *l,
+ const struct compat_12_sys_reboot_args *uap, register_t *retval)
{
/* {
syscallarg(int) opt;
@@ -61,4 +69,17 @@ compat_12_sys_reboot(struct lwp *l, cons
KERNEL_UNLOCK_ONE(NULL);
return (0);
}
-/*#endif COMPAT_12 */
+
+int
+kern_xxx_12_init(void)
+{
+
+ return syscall_establish(NULL, kern_xxx_12_syscalls);
+}
+
+int
+kern_xxx_12_fini(void)
+{
+
+ return syscall_disestablish(NULL, kern_xxx_12_syscalls);
+}
Index: src/sys/compat/common/vfs_syscalls_12.c
diff -u src/sys/compat/common/vfs_syscalls_12.c:1.35 src/sys/compat/common/vfs_syscalls_12.c:1.35.2.1
--- src/sys/compat/common/vfs_syscalls_12.c:1.35 Sun Dec 3 15:23:30 2017
+++ src/sys/compat/common/vfs_syscalls_12.c Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_12.c,v 1.35 2017/12/03 15:23:30 christos Exp $ */
+/* $NetBSD: vfs_syscalls_12.c,v 1.35.2.1 2018/03/31 09:17:35 pgoyette Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.35 2017/12/03 15:23:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.35.2.1 2018/03/31 09:17:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,11 +53,24 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls
#include <sys/dirent.h>
#include <sys/vfs_syscalls.h>
+#include <sys/syscall.h>
+#include <sys/syscallvar.h>
#include <sys/syscallargs.h>
#include <compat/sys/stat.h>
#include <compat/sys/dirent.h>
+#include <compat/common/compat_mod.h>
+
+static const struct syscall_package vfs_syscalls_12_syscalls[] = {
+ { SYS_compat_12_fstat12, 0, (sy_call_t *)compat_12_sys_fstat },
+ { SYS_compat_12_getdirentries, 0,
+ (sy_call_t *)compat_12_sys_getdirentries },
+ { SYS_compat_12_lstat12, 0, (sy_call_t *)compat_12_sys_lstat },
+ { SYS_compat_12_stat12, 0, (sy_call_t *)compat_12_sys_stat },
+ { 0, 0, NULL }
+};
+
/*
* Convert from a new to an old stat structure.
*/
@@ -89,7 +102,8 @@ compat_12_stat_conv(const struct stat *s
* Read a block of directory entries in a file system independent format.
*/
int
-compat_12_sys_getdirentries(struct lwp *l, const struct compat_12_sys_getdirentries_args *uap, register_t *retval)
+compat_12_sys_getdirentries(struct lwp *l,
+ const struct compat_12_sys_getdirentries_args *uap, register_t *retval)
{
/* {
syscallarg(int) fd;
@@ -245,7 +259,8 @@ out1:
*/
/* ARGSUSED */
int
-compat_12_sys_stat(struct lwp *l, const struct compat_12_sys_stat_args *uap, register_t *retval)
+compat_12_sys_stat(struct lwp *l, const struct compat_12_sys_stat_args *uap,
+ register_t *retval)
{
/* {
syscallarg(const char *) path;
@@ -269,7 +284,8 @@ compat_12_sys_stat(struct lwp *l, const
*/
/* ARGSUSED */
int
-compat_12_sys_lstat(struct lwp *l, const struct compat_12_sys_lstat_args *uap, register_t *retval)
+compat_12_sys_lstat(struct lwp *l, const struct compat_12_sys_lstat_args *uap,
+ register_t *retval)
{
/* {
syscallarg(const char *) path;
@@ -292,7 +308,8 @@ compat_12_sys_lstat(struct lwp *l, const
*/
/* ARGSUSED */
int
-compat_12_sys_fstat(struct lwp *l, const struct compat_12_sys_fstat_args *uap, register_t *retval)
+compat_12_sys_fstat(struct lwp *l, const struct compat_12_sys_fstat_args *uap,
+ register_t *retval)
{
/* {
syscallarg(int) fd;
@@ -309,3 +326,17 @@ compat_12_sys_fstat(struct lwp *l, const
}
return (error);
}
+
+int
+vfs_syscalls_12_init(void)
+{
+
+ return syscall_establish(NULL, vfs_syscalls_12_syscalls);
+}
+
+int
+vfs_syscalls_12_fini(void)
+{
+
+ return syscall_disestablish(NULL, vfs_syscalls_12_syscalls);
+}
Index: src/sys/compat/common/vm_12.c
diff -u src/sys/compat/common/vm_12.c:1.20 src/sys/compat/common/vm_12.c:1.20.56.1
--- src/sys/compat/common/vm_12.c:1.20 Wed Jan 19 10:21:16 2011
+++ src/sys/compat/common/vm_12.c Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_12.c,v 1.20 2011/01/19 10:21:16 tsutsui Exp $ */
+/* $NetBSD: vm_12.c,v 1.20.56.1 2018/03/31 09:17:35 pgoyette Exp $ */
/*
* Copyright (c) 1997 Matthew R. Green
@@ -27,17 +27,28 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_12.c,v 1.20 2011/01/19 10:21:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_12.c,v 1.20.56.1 2018/03/31 09:17:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/syscall.h>
+#include <sys/syscallvar.h>
#include <sys/syscallargs.h>
#include <sys/swap.h>
#include <sys/mman.h>
+#include <compat/common/compat_mod.h>
+
+static const struct syscall_package vm_12_syscalls[] = {
+ { SYS_compat_12_msync, 0, (sy_call_t *)compat_12_sys_msync },
+ { SYS_compat_12_oswapon, 0, (sy_call_t *)compat_12_sys_swapon },
+ { 0, 0, NULL }
+};
+
int
-compat_12_sys_swapon(struct lwp *l, const struct compat_12_sys_swapon_args *uap, register_t *retval)
+compat_12_sys_swapon(struct lwp *l,
+ const struct compat_12_sys_swapon_args *uap, register_t *retval)
{
/* {
syscallarg(const char *) name;
@@ -52,7 +63,8 @@ compat_12_sys_swapon(struct lwp *l, cons
}
int
-compat_12_sys_msync(struct lwp *l, const struct compat_12_sys_msync_args *uap, register_t *retval)
+compat_12_sys_msync(struct lwp *l,
+ const struct compat_12_sys_msync_args *uap, register_t *retval)
{
/* {
syscallarg(void *) addr;
@@ -65,3 +77,17 @@ compat_12_sys_msync(struct lwp *l, const
SCARG(&ua, flags) = MS_SYNC | MS_INVALIDATE;
return (sys___msync13(l, &ua, retval));
}
+
+int
+vm_12_init(void)
+{
+
+ return syscall_establish(NULL, vm_12_syscalls);
+}
+
+int
+vm_12_fini(void)
+{
+
+ return syscall_disestablish(NULL, vm_12_syscalls);
+}
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.202.2.17 src/sys/modules/Makefile:1.202.2.18
--- src/sys/modules/Makefile:1.202.2.17 Fri Mar 30 23:58:00 2018
+++ src/sys/modules/Makefile Sat Mar 31 09:17:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202.2.17 2018/03/30 23:58:00 pgoyette Exp $
+# $NetBSD: Makefile,v 1.202.2.18 2018/03/31 09:17:35 pgoyette Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@
SUBDIR+= compat compat_util
SUBDIR+= compat_80 compat_70 compat_60 compat_50 compat_40
SUBDIR+= compat_30 compat_20 compat_16 compat_14 compat_13
-SUBDIR+= #compat_12 compat_10 compat_09
+SUBDIR+= compat_12 #compat_10 compat_09
SUBDIR+= compat_ossaudio
SUBDIR+= compat_sysv
Added files:
Index: src/sys/compat/common/compat_12_mod.c
diff -u /dev/null src/sys/compat/common/compat_12_mod.c:1.1.2.1
--- /dev/null Sat Mar 31 09:17:36 2018
+++ src/sys/compat/common/compat_12_mod.c Sat Mar 31 09:17:35 2018
@@ -0,0 +1,119 @@
+/* $NetBSD: compat_12_mod.c,v 1.1.2.1 2018/03/31 09:17:35 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_12_mod.c,v 1.1.2.1 2018/03/31 09:17:35 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_12_init(void)
+{
+ int error;
+
+ error = kern_xxx_12_init();
+ if (error != 0)
+ return error;
+
+ error = vm_12_init();
+ if (error != 0) {
+ kern_xxx_12_fini();
+ return error;
+ }
+
+ error = vfs_syscalls_12_init();
+ if (error != 0) {
+ vm_12_fini();
+ kern_xxx_12_fini();
+ return error;
+ }
+
+ return 0;
+}
+
+int
+compat_12_fini(void)
+{
+ int error;
+
+ error = vfs_syscalls_12_fini();
+ if (error != 0)
+ return error;
+
+ error = vm_12_fini();
+ if (error != 0) {
+ vfs_syscalls_12_init();
+ return error;
+ }
+
+ error = kern_xxx_12_fini();
+ if (error != 0) {
+ vm_12_init();
+ vfs_syscalls_12_init();
+ return error;
+ }
+
+ return 0;
+}
+
+#ifdef _MODULE
+
+#define REQD_12_1 "compat_60,compat_50,compat_40,compat_30,"
+#define REQD_12_2 "compat_20,compat_16,compat_14,compat_13"
+
+MODULE(MODULE_CLASS_EXEC, compat_12, REQD_12_1 REQD_12_2);
+
+static int
+compat_12_modcmd(modcmd_t cmd, void *arg)
+{
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ return compat_12_init();
+ case MODULE_CMD_FINI:
+ return compat_12_init();
+ default:
+ return ENOTTY;
+ }
+}
+#endif
Index: src/sys/modules/compat_12/Makefile
diff -u /dev/null src/sys/modules/compat_12/Makefile:1.1.2.1
--- /dev/null Sat Mar 31 09:17:36 2018
+++ src/sys/modules/compat_12/Makefile Sat Mar 31 09:17:35 2018
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1.2.1 2018/03/31 09:17:35 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_12
+
+CPPFLAGS+= -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_12_mod.c
+SRCS+= vm_12.c kern_xxx_12.c vfs_syscalls_12.c
+
+
+.include <bsd.kmodule.mk>
