The branch main has been updated by nc (ports committer):
URL:
https://cgit.FreeBSD.org/src/commit/?id=8a1a42b2a7a428fb97fda9f19fd0d67a4eec7535
commit 8a1a42b2a7a428fb97fda9f19fd0d67a4eec7535
Author: Neel Chauhan <n...@freebsd.org>
AuthorDate: 2021-06-09 21:38:52 +0000
Commit: Neel Chauhan <n...@freebsd.org>
CommitDate: 2021-06-09 21:41:44 +0000
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)
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D30710
---
sys/compat/linuxkpi/common/include/linux/lockdep.h | 5 +++++
sys/sys/param.h | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h
b/sys/compat/linuxkpi/common/include/linux/lockdep.h
index de82d06a419e..d12bd049b820 100644
--- a/sys/compat/linuxkpi/common/include/linux/lockdep.h
+++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h
@@ -79,6 +79,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)
@@ -91,4 +92,8 @@ lockdep_is_held(void *__m)
#define lock_map_acquire_read(_map) do { } while (0)
#define lock_map_release(_map) 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 d3a6fae783d4..d78612b5ebb9 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -76,7 +76,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1400019
+#define __FreeBSD_version 1400020
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
