summaryrefslogtreecommitdiffstats
path: root/arch/x86
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 /arch/x86
parentc8e69391d046a6acaa6a4cf72f9952ecd77d3085 (diff)
parentd19e789f068b3d633cbac430764962f404198022 (diff)
downloadlinux-5ece08178d6567db5ef0090b1ae7f795c3c36161.tar.bz2
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 'arch/x86')
-rw-r--r--arch/x86/include/asm/bug.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h
index 028189575560..297fa12e7e27 100644
--- a/arch/x86/include/asm/bug.h
+++ b/arch/x86/include/asm/bug.h
@@ -3,6 +3,7 @@
#define _ASM_X86_BUG_H
#include <linux/stringify.h>
+#include <linux/instrumentation.h>
/*
* Despite that some emulators terminate on UD2, we use it for WARN().