linux-kernel - [patchlet] locking: fix trivial f70405afc99b RT build breakage

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date: Thu, 04 Apr 2024 07:02:41 +0200
From: Mike Galbraith <efault@....de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Matthew Wilcox <willy@...radead.org>
Subject: [patchlet] locking: fix trivial f70405afc99b RT build breakage


Two trivial RT build issues arrived along with f70405afc99b: WARN_ON() being
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_held_write()")
Cc: Matthew Wilcox (Oracle) <willy@...radead.org>
Signed-off-by: Mike Galbraith <efault@....de>
---
 include/linux/rwbase_rt.h |    1 +
 include/linux/rwsem.h     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- 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)
--- 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_semaphore *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)