summaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-03 14:25:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-03 14:25:40 -0700
commit5ece08178d6567db5ef0090b1ae7f795c3c36161 (patch)
treee052c9473b8ec03b278d74e829da21a3c33a41a6 /include/asm-generic
parentc8e69391d046a6acaa6a4cf72f9952ecd77d3085 (diff)
parentd19e789f068b3d633cbac430764962f404198022 (diff)
Merge tag 'core-headers-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull header cleanup from Ingo Molnar: "Separate out the instrumentation_begin()/end() bits from compiler.h" * tag 'core-headers-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: compiler.h: Move instrumentation_begin()/end() to new <linux/instrumentation.h> header
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/bug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index c94e33ae3e7b..18b0f4eee8cb 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -3,6 +3,7 @@
#define _ASM_GENERIC_BUG_H
#include <linux/compiler.h>
+#include <linux/instrumentation.h>
#define CUT_HERE "------------[ cut here ]------------\n"