The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bc2ccf0e4f8f655c00ab5cb344bdff0ee9546060
commit bc2ccf0e4f8f655c00ab5cb344bdff0ee9546060 Author: Mateusz Guzik <[email protected]> AuthorDate: 2022-12-11 03:26:23 +0000 Commit: Mateusz Guzik <[email protected]> CommitDate: 2022-12-11 03:26:23 +0000 mtx: retire PARTIAL_PICKUP_GIANT It does not appear to have ever been used. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/sys/mutex.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 04e2c823541a..0d5123da3b32 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -509,16 +509,13 @@ do { \ } #define PICKUP_GIANT() \ - PARTIAL_PICKUP_GIANT(); \ -} while (0) - -#define PARTIAL_PICKUP_GIANT() \ mtx_assert(&Giant, MA_NOTOWNED); \ if (__predict_false(_giantcnt > 0)) { \ while (_giantcnt--) \ mtx_lock(&Giant); \ WITNESS_RESTORE(&Giant.lock_object, Giant); \ - } + } \ +} while (0) #endif struct mtx_args {
