From: Willy Tarreau <w@1wt.eu>
Date: Wed, 16 Aug 2023 20:25:34 +0000 (+0200)
Subject: IMPORT: plock: also support inlining the int code
X-Git-Tag: v2.9-dev4~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6b98f05d2ee7bc91771c9a730d19dc40e3d83d9;p=thirdparty%2Fhaproxy.git

IMPORT: plock: also support inlining the int code

Commit 9db830b ("plock: support inlining exponential backoff code")
added an option to support inlining of the wait code for longs but
forgot to do it for ints. Let's do it now.

This is plock upstream commit b1f9f0d252fa40577d11cfb2bc0a809d6960a297.
---

diff --git a/include/import/plock.h b/include/import/plock.h
index 4e6ab8c264..1345e958a4 100644
--- a/include/import/plock.h
+++ b/include/import/plock.h
@@ -138,7 +138,11 @@ static unsigned long pl_wait_unlock_long(const unsigned long *lock, const unsign
 		_r; /* return value */            \
 	})
 #else
+# if defined(PLOCK_INLINE_EBO)
+__attribute__((unused,always_inline,no_instrument_function)) inline
+# else
 __attribute__((unused,noinline,no_instrument_function))
+# endif
 static unsigned int pl_wait_unlock_int(const unsigned int *lock, const unsigned int mask)
 {
 	unsigned int ret;