Merge 5.2-rc7 into android-mainline

Linux 5.2-rc7 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2019-07-01 11:23:22 +02:00
parent d5458786d8 6fbc7275c7
commit 96e821be4b
157 changed files with 1341 additions and 517 deletions
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -241,6 +241,7 @@ struct perf_event;
 #define PERF_PMU_CAP_NO_INTERRUPT		0x01
 #define PERF_PMU_CAP_NO_NMI			0x02
 #define PERF_PMU_CAP_AUX_NO_SG			0x04
+#define PERF_PMU_CAP_EXTENDED_REGS		0x08
 #define PERF_PMU_CAP_EXCLUSIVE			0x10
 #define PERF_PMU_CAP_ITRACE			0x20
 #define PERF_PMU_CAP_HETEROGENEOUS_CPUS		0x40