diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
| commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
| tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/linux/mutex.h | |
| parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/mutex.h')
| -rw-r--r-- | include/linux/mutex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 7a0e5c4f8072..3069ec7e0ab8 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h | |||
| @@ -50,8 +50,10 @@ struct mutex { | |||
| 50 | atomic_t count; | 50 | atomic_t count; |
| 51 | spinlock_t wait_lock; | 51 | spinlock_t wait_lock; |
| 52 | struct list_head wait_list; | 52 | struct list_head wait_list; |
| 53 | #ifdef CONFIG_DEBUG_MUTEXES | 53 | #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP) |
| 54 | struct thread_info *owner; | 54 | struct thread_info *owner; |
| 55 | #endif | ||
| 56 | #ifdef CONFIG_DEBUG_MUTEXES | ||
| 55 | const char *name; | 57 | const char *name; |
| 56 | void *magic; | 58 | void *magic; |
| 57 | #endif | 59 | #endif |
| @@ -68,7 +70,6 @@ struct mutex_waiter { | |||
| 68 | struct list_head list; | 70 | struct list_head list; |
| 69 | struct task_struct *task; | 71 | struct task_struct *task; |
| 70 | #ifdef CONFIG_DEBUG_MUTEXES | 72 | #ifdef CONFIG_DEBUG_MUTEXES |
| 71 | struct mutex *lock; | ||
| 72 | void *magic; | 73 | void *magic; |
| 73 | #endif | 74 | #endif |
| 74 | }; | 75 | }; |