Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2018-08-02 09:59:20 +02:00
parent 25a00ac7dc ce03b6d2b6
commit 16e0e6a83b
231 changed files with 2299 additions and 1103 deletions
--- 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"
--- 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"