diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
| commit | 4ccb6aea4b3eb97c94575d1ed4bf10744169f082 (patch) | |
| tree | a2ca8bc8b567608bd4067593b752f78c895d713b /drivers/oprofile/cpu_buffer.c | |
| parent | f25d384755191690b1196776d319cb6a4e899f28 (diff) | |
| parent | 093b995e3b55a0ae0670226ddfcb05bfbf0099ae (diff) | |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
| -rw-r--r-- | drivers/oprofile/cpu_buffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index 0581461c3a67..eda2633a393d 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c @@ -23,6 +23,8 @@ #include <linux/oprofile.h> #include <linux/errno.h> +#include <asm/ptrace.h> + #include "event_buffer.h" #include "cpu_buffer.h" #include "buffer_sync.h" |