Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6

1 files changed, 5 insertions, 0 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 78eb92ae4d94..85b53f87c703 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -817,6 +817,11 @@ struct task_struct {
 /* Protection of proc_dentry: nesting proc_lock, dcache_lock, write_lock_irq(&tasklist_lock); */
         spinlock_t proc_lock;
 
+#ifdef CONFIG_DEBUG_MUTEXES
+        /* mutex deadlock detection */
+        struct mutex_waiter *blocked_on;
+#endif
+
 /* journalling filesystem info */
         void *journal_info;