summaryrefslogtreecommitdiff
path: root/include/linux/irqflags.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-03-20 12:56:40 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-03-21 16:03:53 +0100
commit2502ec37a7b228b34c1e2e89480f98b92f53046a (patch)
tree0064b98cf43a5bd4782998ed9f5d7514a854eaa4 /include/linux/irqflags.h
parent46db36abc32dfd18041c57d571fe4945fc0057fe (diff)
lockdep: Rename trace_hardirq_{enter,exit}()
Continue what commit: d820ac4c2fa8 ("locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]") started, rename these to avoid confusing them with tracepoints. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Will Deacon <will@kernel.org> Link: https://lkml.kernel.org/r/20200320115859.060481361@infradead.org
Diffstat (limited to 'include/linux/irqflags.h')
-rw-r--r--include/linux/irqflags.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 21619c92c377..7c4e64589250 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -35,11 +35,11 @@
# define trace_softirq_context(p) ((p)->softirq_context)
# define trace_hardirqs_enabled(p) ((p)->hardirqs_enabled)
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
-# define trace_hardirq_enter() \
+# define lockdep_hardirq_enter() \
do { \
current->hardirq_context++; \
} while (0)
-# define trace_hardirq_exit() \
+# define lockdep_hardirq_exit() \
do { \
current->hardirq_context--; \
} while (0)
@@ -58,8 +58,8 @@ do { \
# define trace_softirq_context(p) 0
# define trace_hardirqs_enabled(p) 0
# define trace_softirqs_enabled(p) 0
-# define trace_hardirq_enter() do { } while (0)
-# define trace_hardirq_exit() do { } while (0)
+# define lockdep_hardirq_enter() do { } while (0)
+# define lockdep_hardirq_exit() do { } while (0)
# define lockdep_softirq_enter() do { } while (0)
# define lockdep_softirq_exit() do { } while (0)
#endif