diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 18:51:23 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:28:47 -0600 |
| commit | 2243558e4ff7c7b642c8347581346186de296dfb (patch) | |
| tree | 320023b994128d709e9f25613101f5fe4905988e /include | |
| parent | 090317642b58aa367b284d6e08b75434e2cc0b86 (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) || \ |