Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d06f23e7 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'perf/core' into perf/updates

parents b3eac026 66eb579e

include/linux/perf_event.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */

};



/**

kernel/events/core.c

+7 −1
Original line number Diff line number Diff line
@@ -1506,11 +1506,17 @@ static int __init perf_workqueue_init(void) 


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

event_filter_match(struct perf_event *event)

{

	return (event->cpu == -1 || event->cpu == smp_processor_id())

	    && perf_cgroup_match(event);

	    && perf_cgroup_match(event) && pmu_filter_match(event);

}



static void