Module Name: src
Committed By: riz
Date: Tue Nov 17 19:18:19 UTC 2015
Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/sys/compat/linux/common [netbsd-7]: linux_mod.c
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_mod.c
Log Message:
Revert ticket #1020, per pgoyette in ticket #1041.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-7.1
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/compat/netbsd32/netbsd32_mod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.32 src/doc/CHANGES-7.1:1.1.2.33
--- src/doc/CHANGES-7.1:1.1.2.32 Mon Nov 16 14:46:54 2015
+++ src/doc/CHANGES-7.1 Tue Nov 17 19:18:19 2015
@@ -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 @@ external/bsd/ntp/scripts/mkver
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 @@ sys/dev/usb/usb_subr.c 1.204
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]
+
Index: src/sys/compat/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.4.4.1 src/sys/compat/linux/common/linux_mod.c:1.4.4.2
--- src/sys/compat/linux/common/linux_mod.c:1.4.4.1 Sun Nov 8 02:02:37 2015
+++ src/sys/compat/linux/common/linux_mod.c Tue Nov 17 19:18:19 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
# 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
Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.1 src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.2
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.1 Sun Nov 8 02:02:36 2015
+++ src/sys/compat/netbsd32/netbsd32_mod.c Tue Nov 17 19:18:19 2015
@@ -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
