Received-SPF: pass (google.com: domain of linux-kernel+bounces-130891-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <68731eaeb522ced5319e3c1e45f03cdca5c8fd2a.camel@gmx.de>
Subject: [patchlet] locking: fix trivial f70405afc99b RT build breakage
From: Mike Galbraith <efault@gmx.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Date: Thu, 04 Apr 2024 07:02:41 +0200
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.42.4 
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:cTGXMd7LcL8=;YawPW2zyMUOBBsQHdnBrAk7j+B6
 TDtuZwU+Zw7cRiZc7q5RqShEnfJHbeU/2d6g+ohf/dAQ0/klnHkds5Q6v2S0uPY0VkmX2H4+t
 nLfvq179QJV37O/Lc6YkB5CsUBGwFBEp9hriYoc/5TTXF/rjhK+g+az8wUacx1y5EyoXKwe0b
 zXpkAuHFV9uiJUFKXF+ugoOXqy1ds1ZO2fWTXg3KdRZyMlrOOUx6c1mZTlQPAjbF7GTcXmL+N
 5PZCm79Dx/WiU5dOPC9WZ3xubul2z/MphL5CjZNdQjtKkWR3JhEXNUBsAOgOnQn7ZKkxFAVP8
 PrmB0PjolgJ/37oCa4YqF8hGEDO9vnSB+s0mqUnXB6MPazlsBne3CHdxehEvv9FX16vQQB9w2
 YgqMobLwkxZXfL+dXpDWOHoAWRTd0KWdrmazLiTzSrgdZb8bXkdkQv6tpQ+ORcCd0+21CPPbe
 LsuaYDxF01FLFfUfi1pEfEi6233jbQ3UdyFwqih+JEzPZ1iAmeryUNBMehyKlqzc+/N5UfOtt
 gweT7hgVRv+vT9ROsoW62q4t9nSXei9iEdpdeEyCwNtK/O4hQfZmyMxKrJ/BDA/19QP0tLqE/
 eaVrG6BzDtLJRI1Psy7Y8mK5T9S8aRqcQIVWiy3YgkHNwCjVtYauXeIFwh71Z7eEuyV9oKZFq
 wIFXABFpNL+MMeTiakRcCgPzdKeLXDhg9hF0D4vN7cohHQSUm2eLHiYtwENOWxBDB0ASfDM+A
 eAk7gkEgHdA3kHC0K5ZG1Y0g0jGtn6BpM78fZN7Ve/bTcuz+du2rXx9YW5oqknz5MplYuRDJJ
 A5rqBBJCNkO1uKmzKL5D+rA5Ivb+625T/WtafvSlXEbOs=


Two trivial RT build issues arrived along with f70405afc99b: WARN_ON() bei=
ng
undefined as added to include/linux/rwbase_rt.h, and the wrong parameter (=
typo)
being passed to rw_base_assert_held_write().

Fixes: f70405afc99b ("locking: Add rwsem_assert_held() and rwsem_assert_he=
ld_write()")
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Mike Galbraith <efault@gmx.de>
=2D--
 include/linux/rwbase_rt.h |    1 +
 include/linux/rwsem.h     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

=2D-- a/include/linux/rwbase_rt.h
+++ b/include/linux/rwbase_rt.h
@@ -4,6 +4,7 @@

 #include <linux/rtmutex.h>
 #include <linux/atomic.h>
+#include <linux/bug.h>

 #define READER_BIAS		(1U << 31)
 #define WRITER_BIAS		(1U << 30)
=2D-- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -174,7 +174,7 @@ static inline void rwsem_assert_held_nol

 static inline void rwsem_assert_held_write_nolockdep(const struct rw_sema=
phore *sem)
 {
-	rw_base_assert_held_write(sem);
+	rw_base_assert_held_write(&sem->rwbase);
 }

 static __always_inline int rwsem_is_contended(struct rw_semaphore *sem)