mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-24 11:25:40 +00:00
90 lines
2.5 KiB
Diff
90 lines
2.5 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Wed, 7 Oct 2020 12:11:33 +0200
|
|
Subject: [PATCH 04/22] 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(-)
|
|
|
|
--- a/include/linux/rtmutex.h
|
|
+++ b/include/linux/rtmutex.h
|
|
@@ -99,9 +99,6 @@ extern void rt_mutex_lock(struct rt_mute
|
|
#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);
|
|
--- a/kernel/locking/rtmutex.c
|
|
+++ b/kernel/locking/rtmutex.c
|
|
@@ -1406,21 +1406,6 @@ rt_mutex_fastlock(struct rt_mutex *lock,
|
|
}
|
|
|
|
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))
|
|
{
|
|
@@ -1528,37 +1513,6 @@ int __sched __rt_mutex_futex_trylock(str
|
|
}
|
|
|
|
/**
|
|
- * 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
|
|
*
|
|
* @lock: the rt_mutex to be locked
|