[src/netbsd-7]: src Revert ticket #1020, per pgoyette in ticket #1041.

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

details:   https://anonhg.NetBSD.org/src/rev/5790ef7e9b35
branches:  netbsd-7
changeset: 799710:5790ef7e9b35
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Nov 17 19:18:19 2015 +0000

description:
Revert ticket #1020, per pgoyette in ticket #1041.

diffstat:

 doc/CHANGES-7.1                     |  14 +++++++-------
 sys/compat/linux/common/linux_mod.c |   7 +++----
 sys/compat/netbsd32/netbsd32_mod.c  |   8 ++++----
 3 files changed, 14 insertions(+), 15 deletions(-)

diffs (86 lines):

diff -r 8dd1ed32e91a -r 5790ef7e9b35 doc/CHANGES-7.1
--- a/doc/CHANGES-7.1   Tue Nov 17 19:09:08 2015 +0000
+++ b/doc/CHANGES-7.1   Tue Nov 17 19:18:19 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.32 2015/11/16 14:46:54 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.33 2015/11/17 19:18:19 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1473,12 +1473,6 @@
        Update ntp to 4.2.8p4.
        [christos, ticket #1024]
 
-sys/compat/linux/common/linux_mod.c            1.5
-sys/compat/netbsd32/netbsd32_mod.c             1.6-1.9
-
-       Fixes for compat modules.
-       [pgoyette, ticket #1020]
-
 usr.sbin/vnconfig/vnconfig.8                   1.40
 
        In NetBSD 7, the vnconfig command was renamed.
@@ -1585,3 +1579,9 @@
 
        Attach serial number as property to all USB devices having one.
        [joerg, ticket #1032]
+
+external/bsd/ntp/scripts/mkver                 1.8
+
+       PR/50426: Dave Tyson: Fix ntp reported version.
+       [christos, ticket #1036]
+
diff -r 8dd1ed32e91a -r 5790ef7e9b35 sys/compat/linux/common/linux_mod.c
--- a/sys/compat/linux/common/linux_mod.c       Tue Nov 17 19:09:08 2015 +0000
+++ b/sys/compat/linux/common/linux_mod.c       Tue Nov 17 19:18:19 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $    */
+/*     $NetBSD: linux_mod.c,v 1.4.4.2 2015/11/17 19:18:19 riz Exp $    */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.2 2015/11/17 19:18:19 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -65,8 +65,7 @@
 # define       MD3     ""
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,compat_sysv"
-       MD1 MD2 MD3);
+MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio" MD1 MD2 MD3);
 
 static struct execsw linux_execsw[] = {
 #if defined(EXEC_ELF32) && ELFSIZE == 32
diff -r 8dd1ed32e91a -r 5790ef7e9b35 sys/compat/netbsd32/netbsd32_mod.c
--- a/sys/compat/netbsd32/netbsd32_mod.c        Tue Nov 17 19:09:08 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_mod.c        Tue Nov 17 19:18:19 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $ */
+/*     $NetBSD: netbsd32_mod.c,v 1.5.2.2 2015/11/17 19:18:19 riz Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.2 2015/11/17 19:18:19 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
-# define       DEPS1   "compat,compat_sysv,nfsserver,mqueue"
+# define       DEPS1   "compat"
 #else
-# define       DEPS1   "compat,compat_sysv,nfsserver,mqueue,ksem"
+# define       DEPS1   "compat,ksem"
 #endif
 
 #ifndef ELFSIZE