aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeel Chauhan <nc@FreeBSD.org>2021-06-09 21:38:52 +0000
committerNeel Chauhan <nc@FreeBSD.org>2021-06-12 00:41:11 +0000
commit658f5eed38c35f3f7d6695110b7dae8dc94d12c7 (patch)
tree5beac1ac28afc10005374565c03a7c656e10e9fc
parentdf370b47a66f27e195a26d0e983a64a3756823bb (diff)
linuxkpi: Add macros for might_lock_nested() and lockdep_(re/un/)pin_lock()
In Linux, these are macros to locks in the kernel for scheduling purposes. But as with other macros in this header, we aren't doing anything with them so we are doing `do {} while (0)` for now. This is needed by the drm-kmod 5.7 update. Approved by: hselasky (src) Differential Revision: https://reviews.freebsd.org/D30710 (cherry picked from commit 8a1a42b2a7a428fb97fda9f19fd0d67a4eec7535)
-rw-r--r--sys/compat/linuxkpi/common/include/linux/lockdep.h5
-rw-r--r--sys/sys/param.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h b/sys/compat/linuxkpi/common/include/linux/lockdep.h
index a86157ba5924..e270224b0bde 100644
--- a/sys/compat/linuxkpi/common/include/linux/lockdep.h
+++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h
@@ -77,6 +77,7 @@ lockdep_is_held(void *__m)
#define might_lock(m) do { } while (0)
#define might_lock_read(m) do { } while (0)
+#define might_lock_nested(m, n) do { } while (0)
#define lock_acquire(...) do { } while (0)
#define lock_release(...) do { } while (0)
@@ -85,4 +86,8 @@ lockdep_is_held(void *__m)
#define mutex_acquire(...) do { } while (0)
#define mutex_release(...) do { } while (0)
+#define lockdep_pin_lock(l) do { } while (0)
+#define lockdep_repin_lock(l,c) do { } while (0)
+#define lockdep_unpin_lock(l,c) do { } while (0)
+
#endif /* _LINUX_LOCKDEP_H_ */
diff --git a/sys/sys/param.h b/sys/sys/param.h
index f9b67ef94bc0..22b93e1d17fa 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1300507 /* Master, propagated to newvers */
+#define __FreeBSD_version 1300508 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,