Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:54:46 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/linux: mutex.h spinlock.h
Added Files:
src/sys/external/bsd/drm2/include/linux: lockdep.h
Log Message:
Move Linux lockdep stuff to its own header file.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/lockdep.h
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/include/linux/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/linux/spinlock.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/mutex.h
diff -u src/sys/external/bsd/drm2/include/linux/mutex.h:1.14 src/sys/external/bsd/drm2/include/linux/mutex.h:1.15
--- src/sys/external/bsd/drm2/include/linux/mutex.h:1.14 Sun Dec 19 00:50:18 2021
+++ src/sys/external/bsd/drm2/include/linux/mutex.h Sun Dec 19 00:54:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.14 2021/12/19 00:50:18 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.15 2021/12/19 00:54:46 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,9 +41,6 @@
#include <linux/list.h>
#include <linux/spinlock.h>
-#define __acquires(lock) /* XXX lockdep annotation */
-#define __releases(lock) /* XXX lockdep annotation */
-
struct mutex {
kmutex_t mtx_lock;
};
@@ -112,15 +109,6 @@ mutex_lock_nest_lock(struct mutex *mutex
mutex_lock(mutex);
}
-#define __lockdep_used __diagused
-#define lockdep_assert_held(m) KASSERT(mutex_owned(&(m)->mtx_lock))
-#define lockdep_assert_held_once(m) KASSERT(mutex_owned(&(m)->mtx_lock))
-#define lockdep_is_held(m) mutex_owned(&(m)->mtx_lock)
-
-#define might_lock(m) KDASSERT(mutex_ownable(&(m)->mtx_lock))
-
-#define SINGLE_DEPTH_NESTING 0
-
static inline void
mutex_lock_nested(struct mutex *mutex, unsigned subclass __unused)
{
Index: src/sys/external/bsd/drm2/include/linux/spinlock.h
diff -u src/sys/external/bsd/drm2/include/linux/spinlock.h:1.8 src/sys/external/bsd/drm2/include/linux/spinlock.h:1.9
--- src/sys/external/bsd/drm2/include/linux/spinlock.h:1.8 Mon Aug 27 06:17:30 2018
+++ src/sys/external/bsd/drm2/include/linux/spinlock.h Sun Dec 19 00:54:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spinlock.h,v 1.8 2018/08/27 06:17:30 riastradh Exp $ */
+/* $NetBSD: spinlock.h,v 1.9 2021/12/19 00:54:46 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,12 +36,11 @@
#include <sys/mutex.h>
#include <machine/limits.h>
+
#include <linux/irqflags.h>
+#include <linux/lockdep.h>
#include <linux/preempt.h>
-#define __acquires(lock) /* XXX lockdep stuff */
-#define __releases(lock) /* XXX lockdep stuff */
-
typedef struct spinlock {
kmutex_t sl_lock;
} spinlock_t;
Added files:
Index: src/sys/external/bsd/drm2/include/linux/lockdep.h
diff -u /dev/null src/sys/external/bsd/drm2/include/linux/lockdep.h:1.1
--- /dev/null Sun Dec 19 00:54:46 2021
+++ src/sys/external/bsd/drm2/include/linux/lockdep.h Sun Dec 19 00:54:46 2021
@@ -0,0 +1,56 @@
+/* $NetBSD: lockdep.h,v 1.1 2021/12/19 00:54:46 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LINUX_LOCKDEP_H_
+#define _LINUX_LOCKDEP_H_
+
+#define __acquires(lock) /* XXX lockdep annotation */
+#define __releases(lock) /* XXX lockdep annotation */
+
+#define __lockdep_used __debugused
+#define lock_acquire_shared_recursive(l, s, t, n, i) __nothing
+#define lock_release(l, n, i) __nothing
+#define lockdep_assert_held(m) KDASSERT(lockdep_is_held(m))
+#define lockdep_assert_held_once(m) KDASSERT(lockdep_is_held(m))
+#define lockdep_is_held(m) mutex_owned(__lockdep_kmutex(m))
+#define might_lock(m) \
+ KDASSERT(mutex_ownable(__lockdep_kmutex(m)))
+
+#define __lockdep_kmutex(m) \
+ (__builtin_types_compatible_p(typeof(*(m)), struct mutex) ? \
+ &((const struct mutex *)(m))->mtx_lock \
+ : __builtin_types_compatible_p(typeof(*(m)), struct spinlock) ? \
+ &((const struct spinlock *)(m))->sl_lock \
+ : NULL)
+
+#define SINGLE_DEPTH_NESTING 0
+
+#endif /* _LINUX_LOCKDEP_H_ */
