Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Dec 2022 03:28:18 GMT
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: bc2ccf0e4f8f - main - mtx: retire PARTIAL_PICKUP_GIANT
Message-ID:  <202212110328.2BB3SIjo048621@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=bc2ccf0e4f8f655c00ab5cb344bdff0ee9546060

commit bc2ccf0e4f8f655c00ab5cb344bdff0ee9546060
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2022-12-11 03:26:23 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
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 {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212110328.2BB3SIjo048621>