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

Commit 4b4969b1 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ingo Molnar
Browse files

perf: Export perf_assign_events() 



Export perf_assign_events() so the uncore code can use it to
schedule events.

Signed-off-by: default avatarZheng Yan <zheng.z.yan@intel.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1339741902-8449-2-git-send-email-zheng.z.yan@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d1ece099

arch/x86/kernel/cpu/perf_event.c

+3 −3
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static bool __perf_sched_find_counter(struct perf_sched *sched) 
	c = sched->constraints[sched->state.event];



	/* Prefer fixed purpose counters */

	if (x86_pmu.num_counters_fixed) {

	if (c->idxmsk64 & (~0ULL << X86_PMC_IDX_FIXED)) {

		idx = X86_PMC_IDX_FIXED;

		for_each_set_bit_from(idx, c->idxmsk, X86_PMC_IDX_MAX) {

			if (!__test_and_set_bit(idx, sched->state.used))
@@ -693,7 +693,7 @@ static bool perf_sched_next_event(struct perf_sched *sched) 
/*

 * Assign a counter for each event.

 */

static int perf_assign_events(struct event_constraint **constraints, int n,

int perf_assign_events(struct event_constraint **constraints, int n,

			int wmin, int wmax, int *assign)

{

	struct perf_sched sched;

arch/x86/kernel/cpu/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -481,6 +481,8 @@ static inline void __x86_pmu_enable_event(struct hw_perf_event *hwc, 


void x86_pmu_enable_all(int added);



int perf_assign_events(struct event_constraint **constraints, int n,

			int wmin, int wmax, int *assign);

int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign);



void x86_pmu_stop(struct perf_event *event, int flags);