lockdep: Introduce wait-type checks

[sfrench/cifs-2.6.git] / include / linux / irqflags.h

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 21619c92c3770ca0cfc1f3381bee2fe8f065da88..fdaf28601cbe18ecc501b0816b2819b93f138464 100644 (file)
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -37,7 +37,12 @@
 # define trace_softirqs_enabled(p)     ((p)->softirqs_enabled)
 # define trace_hardirq_enter()                 \
 do {                                           \
-       current->hardirq_context++;             \
+       if (!current->hardirq_context++)        \
+               current->hardirq_threaded = 0;  \
+} while (0)
+# define trace_hardirq_threaded()              \
+do {                                           \
+       current->hardirq_threaded = 1;          \
 } while (0)
 # define trace_hardirq_exit()                  \
 do {                                           \
@@ -59,6 +64,7 @@ do {                                          \
 # define trace_hardirqs_enabled(p)     0
 # define trace_softirqs_enabled(p)     0
 # define trace_hardirq_enter()         do { } while (0)
+# define trace_hardirq_threaded()      do { } while (0)
 # define trace_hardirq_exit()          do { } while (0)
 # define lockdep_softirq_enter()       do { } while (0)
 # define lockdep_softirq_exit()                do { } while (0)