summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-13 09:05:37 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-13 09:05:37 +0200
commite66d001c454b9ac8d7b809e84f457b98def209a1 (patch)
treec8686bcdbe83e12216f3ad20202105d3b11c9b56 /include
parentbab5c80b211035739997ebd361a679fa85b39465 (diff)
parentca2b497253ad01c80061a1f3ee9eb91b5d54a849 (diff)
downloadlinux-stable-e66d001c454b9ac8d7b809e84f457b98def209a1.tar.gz
linux-stable-e66d001c454b9ac8d7b809e84f457b98def209a1.tar.bz2
linux-stable-e66d001c454b9ac8d7b809e84f457b98def209a1.zip
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Will writes: "More arm64 fixes - Reject CHAIN PMU events when they are not part of a 64-bit counter - Fix WARN_ON_ONCE() that triggers for reserved regions that don't correspond to mapped memory" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: perf: Reject stand-alone CHAIN events for PMUv3 arm64: Fix /proc/iomem for reserved but not memory regions
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf/arm_pmu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index 10f92e1d8e7b..bf309ff6f244 100644
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -99,6 +99,7 @@ struct arm_pmu {
void (*stop)(struct arm_pmu *);
void (*reset)(void *);
int (*map_event)(struct perf_event *event);
+ int (*filter_match)(struct perf_event *event);
int num_events;
bool secure_access; /* 32-bit ARM only */
#define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40