diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-15 23:41:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:49 -0700 |
| commit | 36cf3b5c3b7228bcf5124c530d50080b61a59f69 (patch) | |
| tree | c131870530e22371da47ad7b717f61d7cb00a84e /kernel/rtmutex_common.h | |
| parent | 0746aec3c75f23de0148774ac50cf73161f09d68 (diff) | |
| download | kernel-crypto-36cf3b5c3b7228bcf5124c530d50080b61a59f69.tar.gz kernel-crypto-36cf3b5c3b7228bcf5124c530d50080b61a59f69.tar.xz kernel-crypto-36cf3b5c3b7228bcf5124c530d50080b61a59f69.zip | |
FUTEX: Tidy up the code
The recent PRIVATE and REQUEUE_PI changes to the futex code made it hard to
read. Tidy it up.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/rtmutex_common.h')
| -rw-r--r-- | kernel/rtmutex_common.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/rtmutex_common.h b/kernel/rtmutex_common.h index 9c75856e791..2d3b83593ca 100644 --- a/kernel/rtmutex_common.h +++ b/kernel/rtmutex_common.h @@ -103,7 +103,7 @@ static inline struct task_struct *rt_mutex_owner(struct rt_mutex *lock) static inline struct task_struct *rt_mutex_real_owner(struct rt_mutex *lock) { - return (struct task_struct *) + return (struct task_struct *) ((unsigned long)lock->owner & ~RT_MUTEX_HAS_WAITERS); } @@ -120,4 +120,11 @@ extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock, struct task_struct *proxy_owner); extern void rt_mutex_proxy_unlock(struct rt_mutex *lock, struct task_struct *proxy_owner); + +#ifdef CONFIG_DEBUG_RT_MUTEXES +# include "rtmutex-debug.h" +#else +# include "rtmutex.h" +#endif + #endif |