evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'perf/core' into perf/updates

Browse source
This commit is contained in:
Will Deacon 2015-05-27 16:12:18 +01:00
commit d06f23e763
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/perf_event.h
View file

@ -304,6 +304,11 @@ struct pmu {
* Free pmu-private AUX data structures * Free pmu-private AUX data structures
*/ */
void (*free_aux) (void *aux); /* optional */ void (*free_aux) (void *aux); /* optional */
/*
* Filter events for PMU-specific reasons.
*/
int (*filter_match) (struct perf_event *event); /* optional */
}; };
/** /**

8
kernel/events/core.c
View file

@ -1506,11 +1506,17 @@ static int __init perf_workqueue_init(void)
core_initcall(perf_workqueue_init); core_initcall(perf_workqueue_init);
static inline int pmu_filter_match(struct perf_event *event)
{
struct pmu *pmu = event->pmu;
return pmu->filter_match ? pmu->filter_match(event) : 1;
}
static inline int static inline int
event_filter_match(struct perf_event *event) event_filter_match(struct perf_event *event)
{ {
return (event->cpu == -1 || event->cpu == smp_processor_id()) return (event->cpu == -1 || event->cpu == smp_processor_id())
&& perf_cgroup_match(event); && perf_cgroup_match(event) && pmu_filter_match(event);
} }
static void static void