CVS commit: src/sys/compat

[Robert Elz]

Module Name:    src
Committed By:   kre
Date:           Fri Dec  8 15:31:13 UTC 2017

Modified Files:
        src/sys/compat/linux/common: linux_mod.c
        src/sys/compat/linux32/common: linux32_mod.c

Log Message:
Finish the previous change - as well as setting the default for these
compat modules back to enabled, stop forcing it to switch back to
disabled any time the module is init'd (which is truly barbaric behaviour.)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux32/common/linux32_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/sys/compat/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.8 src/sys/compat/linux/common/linux_mod.c:1.9
--- src/sys/compat/linux/common/linux_mod.c:1.8	Fri Dec  1 22:14:52 2017
+++ src/sys/compat/linux/common/linux_mod.c	Fri Dec  8 15:31:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_mod.c,v 1.8 2017/12/01 22:14:52 joerg Exp $	*/
+/*	$NetBSD: linux_mod.c,v 1.9 2017/12/08 15:31:13 kre 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.8 2017/12/01 22:14:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.9 2017/12/08 15:31:13 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -158,7 +158,6 @@ compat_linux_modcmd(modcmd_t cmd, void *
 
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		linux_enabled = 0;
 		linux_futex_init();
 		linux_sysctl_init();
 		return 0;

Index: src/sys/compat/linux32/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.9 src/sys/compat/linux32/common/linux32_mod.c:1.10
--- src/sys/compat/linux32/common/linux32_mod.c:1.9	Fri Dec  1 22:14:52 2017
+++ src/sys/compat/linux32/common/linux32_mod.c	Fri Dec  8 15:31:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_mod.c,v 1.9 2017/12/01 22:14:52 joerg Exp $	*/
+/*	$NetBSD: linux32_mod.c,v 1.10 2017/12/08 15:31:13 kre Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.9 2017/12/01 22:14:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.10 2017/12/08 15:31:13 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -117,7 +117,6 @@ compat_linux32_modcmd(modcmd_t cmd, void
 
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		linux32_enabled = 0;
 		linux32_sysctl_init();
 		return 0;