summaryrefslogtreecommitdiffstats
path: root/tools/include/linux
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2020-04-21 09:36:03 -0700
committerTony Lindgren <tony@atomide.com>2020-04-21 09:36:03 -0700
commit175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3 (patch)
treec7fd682de61e3c2a6cc3ba0e8881b99fafdf969c /tools/include/linux
parent07bdc492cff6f555538df95e9812fe72e16d154a (diff)
parent90d4d3f4ea45370d482fa609dbae4d2281b4074f (diff)
downloadcachepc-linux-175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3.tar.gz
cachepc-linux-175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3.zip
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'tools/include/linux')
-rw-r--r--tools/include/linux/irqflags.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/include/linux/irqflags.h b/tools/include/linux/irqflags.h
index e734da3e5b33..67e01bbadbfe 100644
--- a/tools/include/linux/irqflags.h
+++ b/tools/include/linux/irqflags.h
@@ -2,12 +2,12 @@
#ifndef _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_
#define _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_
-# define trace_hardirq_context(p) 0
-# 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_context(p) 0
+# define lockdep_softirq_context(p) 0
+# define lockdep_hardirqs_enabled(p) 0
+# define lockdep_softirqs_enabled(p) 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)
# define INIT_TRACE_IRQFLAGS