| Subject: lockdep: Make it RT aware |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun, 17 Jul 2011 18:51:23 +0200 |
| |
| teach lockdep that we don't really do softirqs on -RT. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| include/linux/irqflags.h | 10 +++++++--- |
| kernel/locking/lockdep.c | 2 ++ |
| 2 files changed, 9 insertions(+), 3 deletions(-) |
| |
| --- 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) || \ |
| --- a/kernel/locking/lockdep.c |
| +++ b/kernel/locking/lockdep.c |
| @@ -3715,6 +3715,7 @@ static void check_flags(unsigned long fl |
| } |
| } |
| |
| +#ifndef CONFIG_PREEMPT_RT_FULL |
| /* |
| * We dont accurately track softirq state in e.g. |
| * hardirq contexts (such as on 4KSTACKS), so only |
| @@ -3729,6 +3730,7 @@ static void check_flags(unsigned long fl |
| DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled); |
| } |
| } |
| +#endif |
| |
| if (!debug_locks) |
| print_irqtrace_events(current); |