summaryrefslogtreecommitdiff
path: root/include/linux/irqflags.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 16:51:23 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:24 (GMT)
commit44eb905c3d2d94cbdf1593476c62cfe5e64630bd (patch)
tree325d069be412b7c547f0bccd9d2ad1d4880dc916 /include/linux/irqflags.h
parentcd71086eab7dfc8fceb61553fd4059d16ca64e4f (diff)
downloadlinux-fsl-qoriq-44eb905c3d2d94cbdf1593476c62cfe5e64630bd.tar.xz
lockdep-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/irqflags.h')
-rw-r--r--include/linux/irqflags.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 37b13c4..a52b35d 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -25,8 +25,6 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
# define trace_hardirq_exit() do { current->hardirq_context--; } while (0)
-# define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
-# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
# define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1,
#else
# define trace_hardirqs_on() do { } while (0)
@@ -39,9 +37,15 @@
# define trace_softirqs_enabled(p) 0
# define trace_hardirq_enter() do { } while (0)
# define trace_hardirq_exit() do { } while (0)
+# define INIT_TRACE_IRQFLAGS
+#endif
+
+#if defined(CONFIG_TRACE_IRQFLAGS) && !defined(CONFIG_PREEMPT_RT_FULL)
+# define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
+# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
+#else
# define lockdep_softirq_enter() do { } while (0)
# define lockdep_softirq_exit() do { } while (0)
-# define INIT_TRACE_IRQFLAGS
#endif
#if defined(CONFIG_IRQSOFF_TRACER) || \