Module Name: src
Committed By: rin
Date: Wed Jun 16 11:55:10 UTC 2021
Modified Files:
src/sys/sys: systm.h
Log Message:
Provide KERNEL_LOCK facilities also for MODULAR, in addition to
MULTIPROCESSOR and _MODULE.
Otherwise, inconsistencies occur between UP kernel and modules,
that have been observed as:
http://mail-index.netbsd.org/port-powerpc/2020/07/07/msg003590.html
http://mail-index.netbsd.org/source-changes-d/2021/06/16/msg013369.html
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/sys/sys/systm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.300 src/sys/sys/systm.h:1.301
--- src/sys/sys/systm.h:1.300 Sun Mar 14 02:53:57 2021
+++ src/sys/sys/systm.h Wed Jun 16 11:55:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.300 2021/03/14 02:53:57 rin Exp $ */
+/* $NetBSD: systm.h,v 1.301 2021/06/16 11:55:10 rin Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -46,6 +46,7 @@
#include "opt_kasan.h"
#include "opt_kcsan.h"
#include "opt_kmsan.h"
+#include "opt_modular.h"
#include "opt_wsdisplay_compat.h"
#endif
#if !defined(_KERNEL) && !defined(_STANDALONE)
@@ -728,7 +729,7 @@ void kernconfig_unlock(void);
bool kernconfig_is_held(void);
#endif
-#if defined(MULTIPROCESSOR) || defined(_MODULE)
+#if defined(MULTIPROCESSOR) || defined(MODULAR) || defined(_MODULE)
#define KERNEL_LOCK(count, lwp) \
do { \
if ((count) != 0) \
