diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
| commit | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (patch) | |
| tree | b4b5e472bafb3d5d0d8ea26680e1d8cc87365c30 /include/linux/mutex.h | |
| parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
| parent | efed792d6738964f399a508ef9e831cd60fa4657 (diff) | |
| download | kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.gz kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.xz kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.zip | |
Merge branch 'tracing/ftrace' into tracing/core
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 7a0e5c4f807..3069ec7e0ab 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -50,8 +50,10 @@ struct mutex { atomic_t count; spinlock_t wait_lock; struct list_head wait_list; -#ifdef CONFIG_DEBUG_MUTEXES +#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP) struct thread_info *owner; +#endif +#ifdef CONFIG_DEBUG_MUTEXES const char *name; void *magic; #endif @@ -68,7 +70,6 @@ struct mutex_waiter { struct list_head list; struct task_struct *task; #ifdef CONFIG_DEBUG_MUTEXES - struct mutex *lock; void *magic; #endif }; |