diff mbox

[RT,0/1] Linux v4.19.322-rt138-rc1

Message ID 20240916101844.280673-1-wagi@monom.org
State New
Headers show

Commit Message

Daniel Wagner Sept. 16, 2024, 10:18 a.m. UTC 
Dear RT Folks,

This is the RT stable review cycle of patch 4.19.322-rt138-rc1.

Please scream at me if I messed something up. Please test the patches
too.

The -rc release is also available on kernel.org

  https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git

on the v4.19-rt-next branch.

If all goes well, this patch will be converted to the next main
release on 2024-09-23.

Signing key fingerprint:

  5BF6 7BC5 0826 72CA BB45  ACAE 587C 5ECA 5D0A 306C

All keys used for the above files and repositories can be found on the
following git repository:

   git://git.kernel.org/pub/scm/docs/kernel/pgpkeys.git

Enjoy!
Daniel


Changes from v4.19.317-rt137:

There was a merge conflict due to the backport of d33d26036a02 ("rtmutex:
Drop rt_mutex::wait_lock before scheduling"). This commit added the lock
argument to rt_mutex_handle_deadlock function.


+++ b/kernel/locking/rtmutex.c
@@@ -1753,12 -1270,8 +1755,12 @@@ int __sched rt_mutex_slowlock_locked(st

        if (unlikely(ret)) {
                __set_current_state(TASK_RUNNING);
 -              remove_waiter(lock, &waiter);
 -              rt_mutex_handle_deadlock(ret, chwalk, lock, &waiter);
 +              remove_waiter(lock, waiter);
 +              /* ww_mutex wants to report EDEADLK/EALREADY, let it */
 +              if (!ww_ctx)
-                       rt_mutex_handle_deadlock(ret, chwalk, waiter);
++                      rt_mutex_handle_deadlock(ret, chwalk, lock, waiter);
 +      } else if (ww_ctx) {
 +              ww_mutex_account_lock(lock, ww_ctx);
        }

        /*

Daniel Wagner (1):
  Linux 4.19.322-rt138

 localversion-rt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --cc kernel/locking/rtmutex.c
index fe5153fc7665,c552fb0b54bc..d012e35708c6
--- a/kernel/locking/rtmutex.c