Skip to content

Commit

Permalink
Merge branch 'locking-urgent-for-linus.patch' of git://git.kernel.org…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Jun 21, 2014
2 parents 7a8e9c8 + 27e3571 commit 7b08d61
Show file tree
Hide file tree
Showing 3 changed files with 218 additions and 35 deletions.
5 changes: 5 additions & 0 deletions kernel/locking/rtmutex-debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ static inline int debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter,
{
return (waiter != NULL);
}

static inline void rt_mutex_print_deadlock(struct rt_mutex_waiter *w)
{
debug_rt_mutex_print_deadlock(w);
}
Loading

0 comments on commit 7b08d61

Please sign in to comment.