CVS commit: [pgoyette-compat] src/sys/kern

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Mon Jul  9 08:45:42 UTC 2018

Modified Files:
        src/sys/kern [pgoyette-compat]: kern_module.c

Log Message:
Put the checks back in the original order, and remove extra ')'

Thanks to soda for finding the real error.


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.12 -r1.130.2.13 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.12 src/sys/kern/kern_module.c:1.130.2.13
--- src/sys/kern/kern_module.c:1.130.2.12	Mon Jul  9 08:26:29 2018
+++ src/sys/kern/kern_module.c	Mon Jul  9 08:45:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.130.2.12 2018/07/09 08:26:29 pgoyette Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.130.2.13 2018/07/09 08:45:41 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.12 2018/07/09 08:26:29 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.13 2018/07/09 08:45:41 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -1039,8 +1039,8 @@ module_do_load(const char *name, bool is
 		}
 	}
 	if (mod) {
-		if (!ISSET(flags, MODCTL_LOAD_FORCE) &&
-		    ISSET(mod->mod_flags, MODFLG_MUST_FORCE)) {
+		if (ISSET(mod->mod_flags, MODFLG_MUST_FORCE) &&
+		    !ISSET(flags, MODCTL_LOAD_FORCE)) {
 			if (!autoload) {
 				module_error("use -f to reinstate "
 				    "builtin module `%s'", name);