diff options
| author | Ben Hutchings <benh@debian.org> | 2020-09-17 22:36:21 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-09-18 01:19:09 +0100 |
| commit | f748212fb137252dc332105d8d45747161a35aff (patch) | |
| tree | ec9daf574d6a695df20928f943491531f0349428 /debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch | |
| parent | 971ce324f6d97ee5508a1fe6b171f2664e3e8dc7 (diff) | |
| download | linux-debian-f748212fb137252dc332105d8d45747161a35aff.tar.gz | |
[rt] Update to 5.9-rc5-rt7 and re-enable
Diffstat (limited to 'debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch')
| -rw-r--r-- | debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch b/debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch index 8ec8e3dfb..6ae9875aa 100644 --- a/debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch +++ b/debian/patches-rt/rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch @@ -2,7 +2,7 @@ From: Thomas Gleixner <tglx@linutronix.de> Date: Thu, 12 Oct 2017 16:36:39 +0200 Subject: rtmutex: export lockdep-less version of rt_mutex's lock, trylock and unlock -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patches-5.6.10-rt5.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.9/older/patches-5.9-rc5-rt7.tar.xz Required for lock implementation ontop of rtmutex. @@ -15,7 +15,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c -@@ -1493,12 +1493,33 @@ rt_mutex_fastunlock(struct rt_mutex *loc +@@ -1491,12 +1491,33 @@ rt_mutex_fastunlock(struct rt_mutex *loc rt_mutex_postunlock(&wake_q); } @@ -51,7 +51,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } #ifdef CONFIG_DEBUG_LOCK_ALLOC -@@ -1539,16 +1560,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock); +@@ -1537,16 +1558,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock); */ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock) { @@ -69,7 +69,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible); -@@ -1574,13 +1586,10 @@ int __sched __rt_mutex_futex_trylock(str +@@ -1572,13 +1584,10 @@ int __sched __rt_mutex_futex_trylock(str * Returns: * 0 on success * -EINTR when interrupted by a signal @@ -84,7 +84,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> } EXPORT_SYMBOL_GPL(rt_mutex_lock_killable); -@@ -1615,6 +1624,14 @@ rt_mutex_timed_lock(struct rt_mutex *loc +@@ -1613,6 +1622,14 @@ rt_mutex_timed_lock(struct rt_mutex *loc } EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); @@ -99,7 +99,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /** * rt_mutex_trylock - try to lock a rt_mutex * -@@ -1630,10 +1647,7 @@ int __sched rt_mutex_trylock(struct rt_m +@@ -1628,10 +1645,7 @@ int __sched rt_mutex_trylock(struct rt_m { int ret; @@ -111,7 +111,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> if (ret) mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_); -@@ -1641,6 +1655,11 @@ int __sched rt_mutex_trylock(struct rt_m +@@ -1639,6 +1653,11 @@ int __sched rt_mutex_trylock(struct rt_m } EXPORT_SYMBOL_GPL(rt_mutex_trylock); |