diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 18:51:23 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-11 11:07:40 -0500 |
| commit | 3fedde1108d707a9b8181049dbde710d4654b17c (patch) | |
| tree | c85f4188eb3bd2bca4cf8c1c7c6e42bb4237beda /include | |
| parent | edd78513bd4599519c6019dedc2b6f424f7b3834 (diff) | |
lockdep-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqflags.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 37b13c41a12a..a52b35d4229f 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) || \ |