diff options
Diffstat (limited to 'features/rt/locking-rtmutex-Remove-rt_mutex_timed_lock.patch')
| -rw-r--r-- | features/rt/locking-rtmutex-Remove-rt_mutex_timed_lock.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/features/rt/locking-rtmutex-Remove-rt_mutex_timed_lock.patch b/features/rt/locking-rtmutex-Remove-rt_mutex_timed_lock.patch new file mode 100644 index 00000000..33f0f4da --- /dev/null +++ b/features/rt/locking-rtmutex-Remove-rt_mutex_timed_lock.patch @@ -0,0 +1,97 @@ +From 0f2d138c83afbe1bb580d0d1ab2e50418bdb7e6e Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Wed, 7 Oct 2020 12:11:33 +0200 +Subject: [PATCH 064/191] locking/rtmutex: Remove rt_mutex_timed_lock() + +rt_mutex_timed_lock() has no callers since commit + c051b21f71d1f ("rtmutex: Confine deadlock logic to futex") + +Remove rt_mutex_timed_lock(). + +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + include/linux/rtmutex.h | 3 --- + kernel/locking/rtmutex.c | 46 ---------------------------------------- + 2 files changed, 49 deletions(-) + +diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h +index 2dc10b582d4a..243fabc2c85f 100644 +--- a/include/linux/rtmutex.h ++++ b/include/linux/rtmutex.h +@@ -99,9 +99,6 @@ extern void rt_mutex_lock(struct rt_mutex *lock); + #endif + + extern int rt_mutex_lock_interruptible(struct rt_mutex *lock); +-extern int rt_mutex_timed_lock(struct rt_mutex *lock, +- struct hrtimer_sleeper *timeout); +- + extern int rt_mutex_trylock(struct rt_mutex *lock); + + extern void rt_mutex_unlock(struct rt_mutex *lock); +diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c +index 5e04d7a247d9..c9a37b6d6ea0 100644 +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c +@@ -1387,21 +1387,6 @@ rt_mutex_fastlock(struct rt_mutex *lock, int state, + return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK); + } + +-static inline int +-rt_mutex_timed_fastlock(struct rt_mutex *lock, int state, +- struct hrtimer_sleeper *timeout, +- enum rtmutex_chainwalk chwalk, +- int (*slowfn)(struct rt_mutex *lock, int state, +- struct hrtimer_sleeper *timeout, +- enum rtmutex_chainwalk chwalk)) +-{ +- if (chwalk == RT_MUTEX_MIN_CHAINWALK && +- likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) +- return 0; +- +- return slowfn(lock, state, timeout, chwalk); +-} +- + static inline int + rt_mutex_fasttrylock(struct rt_mutex *lock, + int (*slowfn)(struct rt_mutex *lock)) +@@ -1509,37 +1494,6 @@ int __sched __rt_mutex_futex_trylock(struct rt_mutex *lock) + return __rt_mutex_slowtrylock(lock); + } + +-/** +- * rt_mutex_timed_lock - lock a rt_mutex interruptible +- * the timeout structure is provided +- * by the caller +- * +- * @lock: the rt_mutex to be locked +- * @timeout: timeout structure or NULL (no timeout) +- * +- * Returns: +- * 0 on success +- * -EINTR when interrupted by a signal +- * -ETIMEDOUT when the timeout expired +- */ +-int +-rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout) +-{ +- int ret; +- +- might_sleep(); +- +- mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_); +- ret = rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout, +- RT_MUTEX_MIN_CHAINWALK, +- rt_mutex_slowlock); +- if (ret) +- mutex_release(&lock->dep_map, _RET_IP_); +- +- return ret; +-} +-EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); +- + /** + * rt_mutex_trylock - try to lock a rt_mutex + * +-- +2.19.1 + |