diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 18:51:23 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-11-14 11:01:58 -0600 |
| commit | 67a5739b37cd4008af740162cde89056ecdd8f01 (patch) | |
| tree | 6f6cd446e23ccfe465b2feecc0bf4377828d37d3 | |
| parent | 53ab7332b052ec5827f194560646e651cc94cdc2 (diff) | |
lockdep-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/irqflags.h | 10 | ||||
| -rw-r--r-- | kernel/lockdep.c | 2 |
2 files changed, 9 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) || \ diff --git a/kernel/lockdep.c b/kernel/lockdep.c index e69434b070da..4ca3efc26674 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -3488,6 +3488,7 @@ static void check_flags(unsigned long flags) } } +#ifndef CONFIG_PREEMPT_RT_FULL /* * We dont accurately track softirq state in e.g. * hardirq contexts (such as on 4KSTACKS), so only @@ -3502,6 +3503,7 @@ static void check_flags(unsigned long flags) DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled); } } +#endif if (!debug_locks) print_irqtrace_events(current); |