| From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| Date: Thu, 21 Sep 2017 14:39:56 +0200 |
| Subject: rt/locking: allow recursive local_trylock() |
| |
| required for following networking patch which does recursive try-lock. |
| While at it, add the !RT version of it because it did not yet exist. |
| |
| Cc: rt-stable@vger.kernel.org |
| Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
| --- |
| include/linux/locallock.h | 9 +++++++++ |
| 1 file changed, 9 insertions(+) |
| |
| --- a/include/linux/locallock.h |
| +++ b/include/linux/locallock.h |
| @@ -68,6 +68,9 @@ static inline int __local_trylock(struct |
| lv->owner = current; |
| lv->nestcnt = 1; |
| return 1; |
| + } else if (lv->owner == current) { |
| + lv->nestcnt++; |
| + return 1; |
| } |
| return 0; |
| } |
| @@ -238,6 +241,12 @@ static inline int __local_unlock_irqrest |
| |
| static inline void local_irq_lock_init(int lvar) { } |
| |
| +#define local_trylock(lvar) \ |
| + ({ \ |
| + preempt_disable(); \ |
| + 1; \ |
| + }) |
| + |
| #define local_lock(lvar) preempt_disable() |
| #define local_unlock(lvar) preempt_enable() |
| #define local_lock_irq(lvar) local_irq_disable() |
