summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch')
-rw-r--r--debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch b/debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch
index 3e02c70df..f49dd6854 100644
--- a/debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch
+++ b/debian/patches-rt/0160-locking-rtmutex-Handle-the-various-new-futex-race-co.patch
@@ -1,9 +1,9 @@
-From faad74e290468f037de33422cb1799c05477242d Mon Sep 17 00:00:00 2001
+From 668dfa34021cfb55bb61bdfaeabfca97146f9831 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 10 Jun 2011 11:04:15 +0200
Subject: [PATCH 160/323] locking/rtmutex: Handle the various new futex race
conditions
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
RT opens a few new interesting race conditions in the rtmutex/futex
combo due to futex hash bucket lock being a 'sleeping' spinlock and
@@ -17,7 +17,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
3 files changed, 94 insertions(+), 21 deletions(-)
diff --git a/kernel/futex/core.c b/kernel/futex/core.c
-index cde0ca876b93..706cd446ec71 100644
+index cde0ca876b935..706cd446ec719 100644
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -2165,6 +2165,16 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
@@ -142,7 +142,7 @@ index cde0ca876b93..706cd446ec71 100644
ret = 0;
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
-index b5d5c570a8ac..2ef5a6eb95da 100644
+index b5d5c570a8acd..2ef5a6eb95daa 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -136,6 +136,11 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
@@ -238,7 +238,7 @@ index b5d5c570a8ac..2ef5a6eb95da 100644
return;
}
diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
-index b1455dc2366f..096b16cfb096 100644
+index b1455dc2366fb..096b16cfb096e 100644
--- a/kernel/locking/rtmutex_common.h
+++ b/kernel/locking/rtmutex_common.h
@@ -125,6 +125,8 @@ enum rtmutex_chainwalk {
@@ -251,5 +251,5 @@ index b1455dc2366f..096b16cfb096 100644
extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner);
--
-2.43.0
+2.44.0