[src/pgoyette-compat]: src/sys/compat/netbsd32 Normalize the required lists. ...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/94b517380204
branches:  pgoyette-compat
changeset: 830854:94b517380204
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Oct 03 11:59:21 2018 +0000

description:
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.

diffstat:

 sys/compat/netbsd32/netbsd32_compat_09.c |  6 +++---
 sys/compat/netbsd32/netbsd32_compat_12.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_13.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_16.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_20.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_30.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_40.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_50.c |  7 +++----
 sys/compat/netbsd32/netbsd32_compat_60.c |  7 +++----
 9 files changed, 27 insertions(+), 35 deletions(-)

diffs (251 lines):

diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_09.c
--- a/sys/compat/netbsd32/netbsd32_compat_09.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_09.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
         { 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_12.c
--- a/sys/compat/netbsd32/netbsd32_compat_12.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_12.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
        { 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_13.c
--- a/sys/compat/netbsd32/netbsd32_compat_13.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_13.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
        { 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_16.c
--- a/sys/compat/netbsd32/netbsd32_compat_16.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_16.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
 
 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_20.c
--- a/sys/compat/netbsd32/netbsd32_compat_20.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_20.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
        { 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_30.c
--- a/sys/compat/netbsd32/netbsd32_compat_30.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_30.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
        { 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_40.c
--- a/sys/compat/netbsd32/netbsd32_compat_40.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_40.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
 }; 
 
 
-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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_50.c
--- a/sys/compat/netbsd32/netbsd32_compat_50.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_50.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
        { 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)
diff -r 3c901be9da8b -r 94b517380204 sys/compat/netbsd32/netbsd32_compat_60.c
--- a/sys/compat/netbsd32/netbsd32_compat_60.c  Wed Oct 03 07:03:17 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_60.c  Wed Oct 03 11:59:21 2018 +0000
@@ -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 @@
 }; 
 
 
-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)