aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 21:18:57 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-06-12 21:18:57 +0100
commit27a513ca8600e96790f9f3a3c3182da947e569d2 (patch)
tree48319c0a53dd76dc2dff6cb15da5c5f145e72cc3 /include
parent970d96f9a81b0dd83ddd8bce0e5e1ba31881c5f5 (diff)
parentbcc8fa83136969c340a8057c44b1d5eb2f4b5295 (diff)
Merge branch 'devel-stable' into for-next
Conflicts: arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 61992cf2e977..67c719cc91aa 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -304,6 +304,11 @@ struct pmu {
* Free pmu-private AUX data structures
*/
void (*free_aux) (void *aux); /* optional */
+
+ /*
+ * Filter events for PMU-specific reasons.
+ */
+ int (*filter_match) (struct perf_event *event); /* optional */
};
/**

Privacy Policy