67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
|
From 3c24406a74b50f5844a5b6540574c5c5ecdb895f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Date: Sun, 17 Jul 2011 18:51:23 +0200
|
||
|
|
Subject: [PATCH 149/365] lockdep: Make it RT aware
|
||
|
|
|
||
|
|
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(-)
|
||
|
|
|
||
|
|
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
|
||
|
|
index f8f27cc5546f..9b77034f7c5e 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/locking/lockdep.c b/kernel/locking/lockdep.c
|
||
|
|
index 736ab5cf03aa..0069ccc49ccf 100644
|
||
|
|
--- a/kernel/locking/lockdep.c
|
||
|
|
+++ b/kernel/locking/lockdep.c
|
||
|
|
@@ -3716,6 +3716,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
|
||
|
|
@@ -3730,6 +3731,7 @@ static void check_flags(unsigned long flags)
|
||
|
|
DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (!debug_locks)
|
||
|
|
print_irqtrace_events(current);
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|