Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:22:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: rwsem.h
Log Message:
linux/rwsem: Reorder members to avoid confusing lockdebug.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/rwsem.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/external/bsd/drm2/include/linux/rwsem.h
diff -u src/sys/external/bsd/drm2/include/linux/rwsem.h:1.4 src/sys/external/bsd/drm2/include/linux/rwsem.h:1.5
--- src/sys/external/bsd/drm2/include/linux/rwsem.h:1.4 Sun Dec 19 11:21:45 2021
+++ src/sys/external/bsd/drm2/include/linux/rwsem.h Sun Dec 19 11:22:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rwsem.h,v 1.4 2021/12/19 11:21:45 riastradh Exp $ */
+/* $NetBSD: rwsem.h,v 1.5 2021/12/19 11:22:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -55,12 +55,16 @@
#define up_write linux_up_write
struct rw_semaphore {
- kmutex_t rws_lock;
- kcondvar_t rws_cv;
+ /*
+ * Note: rws_lock and rws_cv must not be first; doing so
+ * confuses lockdebug.
+ */
struct lwp *rws_writer;
unsigned rws_readers;
bool rws_writewanted;
bool rws_debug;
+ kmutex_t rws_lock;
+ kcondvar_t rws_cv;
};
void init_rwsem(struct rw_semaphore *);
