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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-02-28 08:27:17 +01:00
parent 43f4e6279f 7d762d6914
commit 9ed8f1a6e7
756 changed files with 7364 additions and 3922 deletions
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -448,6 +448,11 @@ struct pmu {
 	 * Filter events for PMU-specific reasons.
 	 */
 	int (*filter_match)		(struct perf_event *event); /* optional */
+
+	/*
+	 * Check period value for PERF_EVENT_IOC_PERIOD ioctl.
+	 */
+	int (*check_period)		(struct perf_event *event, u64 value); /* optional */
 };

 enum perf_addr_filter_action_t {