Date: Sat, 12 Jun 2021 00:41:07 GMT From: Neel Chauhan <nc@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 658f5eed38c3 - stable/13 - linuxkpi: Add macros for might_lock_nested() and lockdep_(re/un/)pin_lock() Message-ID: <202106120041.15C0f7Ep057736@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by nc (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=658f5eed38c35f3f7d6695110b7dae8dc94d12c7 commit 658f5eed38c35f3f7d6695110b7dae8dc94d12c7 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2021-06-09 21:38:52 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2021-06-12 00:41:11 +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) Differential Revision: https://reviews.freebsd.org/D30710 (cherry picked from commit 8a1a42b2a7a428fb97fda9f19fd0d67a4eec7535) --- 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 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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106120041.15C0f7Ep057736>