diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-07-31 07:43:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-07-31 07:43:48 +0200 |
commit | ce03b6d2b610b70bb527d14d82c2394adb235e5d (patch) | |
tree | 1e73af0e3dea8f7546540245b3660009dab982c8 /tools/perf/arch/x86/util/tsc.c | |
parent | 156c8b58ef5cfd97245928c95669fd4cb0f9c388 (diff) | |
parent | 44fe619b1418ff4e9d2f9518a940fbe2fb686a08 (diff) | |
download | 96b-common-ce03b6d2b610b70bb527d14d82c2394adb235e5d.tar.gz |
Merge tag 'perf-urgent-for-mingo-4.18-20180730' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Update the tools copy of several files, including perf_event.h,
powerpc's asm/unistd.h (new io_pgetevents syscall), bpf.h and
x86's memcpy_64.s (used in 'perf bench mem'), silencing the
respective warnings during the perf tools build.
- Fix the build on the alpine:edge distro.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch/x86/util/tsc.c')
-rw-r--r-- | tools/perf/arch/x86/util/tsc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c index 06bae7023a51..950539f9a4f7 100644 --- a/tools/perf/arch/x86/util/tsc.c +++ b/tools/perf/arch/x86/util/tsc.c @@ -2,6 +2,7 @@ #include <stdbool.h> #include <errno.h> +#include <linux/stddef.h> #include <linux/perf_event.h> #include "../../perf.h" |