diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-21 07:06:02 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-21 07:06:02 -1000 |
| commit | 7b08d618a232aa3bfc538cf1eccd9ce0c239bf03 (patch) | |
| tree | c440cd867dc7454202115f77f6a46375b770b88a /kernel/locking/rtmutex.h | |
| parent | 7a8e9c80889732891df50d44328f330316834eb1 (diff) | |
| parent | 27e35715df54cbc4f2d044f681802ae30479e7fb (diff) | |
| download | talos-op-linux-7b08d618a232aa3bfc538cf1eccd9ce0c239bf03.tar.gz talos-op-linux-7b08d618a232aa3bfc538cf1eccd9ce0c239bf03.zip | |
Merge branch 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull rtmutex fixes from Thomas Gleixner:
"Another three patches to make the rtmutex code more robust. That's
the last urgent fallout from the big futex/rtmutex investigation"
* 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
rtmutex: Plug slow unlock race
rtmutex: Detect changes in the pi lock chain
rtmutex: Handle deadlock detection smarter
Diffstat (limited to 'kernel/locking/rtmutex.h')
| -rw-r--r-- | kernel/locking/rtmutex.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/locking/rtmutex.h b/kernel/locking/rtmutex.h index a1a1dd06421d..f6a1f3c133b1 100644 --- a/kernel/locking/rtmutex.h +++ b/kernel/locking/rtmutex.h @@ -24,3 +24,8 @@ #define debug_rt_mutex_print_deadlock(w) do { } while (0) #define debug_rt_mutex_detect_deadlock(w,d) (d) #define debug_rt_mutex_reset_waiter(w) do { } while (0) + +static inline void rt_mutex_print_deadlock(struct rt_mutex_waiter *w) +{ + WARN(1, "rtmutex deadlock detected\n"); +} |
