[PATCH] lockdep: annotate waitqueues

[linux-2.6-omap-h63xx.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index aaf723308ed4c817678d34984ad8c7488357181d..8ebddba4448d12765c71410b17acb14156bfbd19 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -865,16 +865,34 @@ struct task_struct {
        struct plist_head pi_waiters;
        /* Deadlock detection and priority inheritance handling */
        struct rt_mutex_waiter *pi_blocked_on;
-# ifdef CONFIG_DEBUG_RT_MUTEXES
-       spinlock_t held_list_lock;
-       struct list_head held_list_head;
-# endif
 #endif
 
 #ifdef CONFIG_DEBUG_MUTEXES
        /* mutex deadlock detection */
        struct mutex_waiter *blocked_on;
 #endif
+#ifdef CONFIG_TRACE_IRQFLAGS
+       unsigned int irq_events;
+       int hardirqs_enabled;
+       unsigned long hardirq_enable_ip;
+       unsigned int hardirq_enable_event;
+       unsigned long hardirq_disable_ip;
+       unsigned int hardirq_disable_event;
+       int softirqs_enabled;
+       unsigned long softirq_disable_ip;
+       unsigned int softirq_disable_event;
+       unsigned long softirq_enable_ip;
+       unsigned int softirq_enable_event;
+       int hardirq_context;
+       int softirq_context;
+#endif
+#ifdef CONFIG_LOCKDEP
+# define MAX_LOCK_DEPTH 30UL
+       u64 curr_chain_key;
+       int lockdep_depth;
+       struct held_lock held_locks[MAX_LOCK_DEPTH];
+       unsigned int lockdep_recursion;
+#endif
 
 /* journalling filesystem info */
        void *journal_info;