diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 05:11:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 05:11:22 -0400 |
| commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
| tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /kernel/locking/rtmutex-debug.h | |
| parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
| parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'kernel/locking/rtmutex-debug.h')
| -rw-r--r-- | kernel/locking/rtmutex-debug.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/locking/rtmutex-debug.h b/kernel/locking/rtmutex-debug.h index 14193d596d78..ab29b6a22669 100644 --- a/kernel/locking/rtmutex-debug.h +++ b/kernel/locking/rtmutex-debug.h | |||
| @@ -31,3 +31,8 @@ static inline int debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter, | |||
| 31 | { | 31 | { |
| 32 | return (waiter != NULL); | 32 | return (waiter != NULL); |
| 33 | } | 33 | } |
| 34 | |||
| 35 | static inline void rt_mutex_print_deadlock(struct rt_mutex_waiter *w) | ||
| 36 | { | ||
| 37 | debug_rt_mutex_print_deadlock(w); | ||
| 38 | } | ||