diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-08-02 10:59:20 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-08-02 10:59:20 +0300 |
| commit | 16e0e6a83b778284ae9b3a57003eeea8d8090b55 (patch) | |
| tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /tools/perf/arch | |
| parent | 25a00ac7dc92912f0b1e5e533bf077255c828b02 (diff) | |
| parent | ce03b6d2b610b70bb527d14d82c2394adb235e5d (diff) | |
| download | linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/arch')
| -rw-r--r-- | tools/perf/arch/x86/util/pmu.c | 1 | ||||
| -rw-r--r-- | tools/perf/arch/x86/util/tsc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index 63a74c32ddc5..e33ef5bc31c5 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <string.h> +#include <linux/stddef.h> #include <linux/perf_event.h> #include "../../util/intel-pt.h" 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" |