diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 14:25:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-03 14:25:40 -0700 |
| commit | 5ece08178d6567db5ef0090b1ae7f795c3c36161 (patch) | |
| tree | e052c9473b8ec03b278d74e829da21a3c33a41a6 /include/linux/context_tracking.h | |
| parent | c8e69391d046a6acaa6a4cf72f9952ecd77d3085 (diff) | |
| parent | d19e789f068b3d633cbac430764962f404198022 (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/linux/context_tracking.h')
| -rw-r--r-- | include/linux/context_tracking.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index 981b880d5b60..d53cd331c4dd 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -5,6 +5,8 @@ #include <linux/sched.h> #include <linux/vtime.h> #include <linux/context_tracking_state.h> +#include <linux/instrumentation.h> + #include <asm/ptrace.h> |