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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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: src/sys/compat/netbsd32/netbsd32_compat_16.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.4 src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.5
--- src/sys/compat/netbsd32/netbsd32_compat_16.c:1.1.2.4 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.4 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_16.c,v 1.1.2.5 2018/10/03 11:59:21 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.4 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.1.2.5 2018/10/03 11:59:21 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
struct uvm_object *emul_netbsd32_object;
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16,
- "compat_netbsd32,compat_netbsd32_20,compat_16");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_16, "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.9 src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.10
--- src/sys/compat/netbsd32/netbsd32_compat_20.c:1.36.10.9 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_20.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.9 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_20.c,v 1.36.10.10 2018/10/03 11:59:21 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.9 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.36.10.10 2018/10/03 11:59:21 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -232,8 +232,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20,
- "compat_netbsd32,compat_netbsd32_30,compat_20");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_20, "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.12 src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.13
--- src/sys/compat/netbsd32/netbsd32_compat_30.c:1.31.16.12 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_30.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.12 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_30.c,v 1.31.16.13 2018/10/03 11:59:21 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.12 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.31.16.13 2018/10/03 11:59:21 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include <opt_ntp.h>
@@ -361,8 +361,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_30,
- "compat_netbsd32,compat_netbsd32_40,compat_30");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_30, "compat_netbsd32_40,compat_30");
static int
compat_netbsd32_30_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_40.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_40.c:1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_40.c:1.1.2.3
--- src/sys/compat/netbsd32/netbsd32_compat_40.c:1.1.2.2 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_40.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_40.c,v 1.1.2.2 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_40.c,v 1.1.2.3 2018/10/03 11:59:21 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_40.c,v 1.1.2.2 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_40.c,v 1.1.2.3 2018/10/03 11:59:21 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,8 +76,7 @@ static struct syscall_package compat_net
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_40,
- "compat_netbsd32,compat_netbsd32_50,compat_40");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_40, "compat_netbsd32_50,compat_40");
static int
compat_netbsd32_40_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.11 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.12
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.32.16.11 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.11 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.32.16.12 2018/10/03 11:59:21 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.11 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.32.16.12 2018/10/03 11:59:21 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1030,8 +1030,7 @@ static struct syscall_package compat_net
{ 0, 0, NULL }
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50,
- "compat_netbsd32,compat_netbsd_60,compat_50");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_50, "compat_netbsd32_60,compat_50");
static int
compat_netbsd32_50_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/netbsd32/netbsd32_compat_60.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.8 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.9
--- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.3.2.8 Wed Oct 3 07:03:17 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_60.c Wed Oct 3 11:59:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.8 2018/10/03 07:03:17 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_60.c,v 1.3.2.9 2018/10/03 11:59:21 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.8 2018/10/03 07:03:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.3.2.9 2018/10/03 11:59:21 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,8 +94,7 @@ static struct syscall_package compat_net
};
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60,
- "compat_netbsd32,compat_netbsd32_80,compat_60");
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32_60, "compat_netbsd32_80,compat_60");
static int
compat_netbsd32_60_modcmd(modcmd_t cmd, void *arg)
