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

Commit 9d0fcba6 authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

perf, x86: Call x86_setup_perfctr() from .hw_config() 



The perfctr setup calls are in the corresponding .hw_config()
functions now. This makes it possible to introduce config functions
for other pmu events that are not perfctr specific.

Also, all of a sudden the code looks much nicer.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1271190201-25705-4-git-send-email-robert.richter@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c1726f34

arch/x86/kernel/cpu/perf_event.c

+2 −7
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ static int x86_pmu_hw_config(struct perf_event *event) 
	if (event->attr.type == PERF_TYPE_RAW)

		event->hw.config |= event->attr.config & X86_RAW_EVENT_MASK;



	return 0;

	return x86_setup_perfctr(event);

}



/*
@@ -543,12 +543,7 @@ static int __hw_perf_event_init(struct perf_event *event) 
	event->hw.last_cpu = -1;

	event->hw.last_tag = ~0ULL;



	/* Processor specifics */

	err = x86_pmu.hw_config(event);

	if (err)

		return err;



	return x86_setup_perfctr(event);

	return x86_pmu.hw_config(event);

}



static void x86_pmu_disable_all(void)

arch/x86/kernel/cpu/perf_event_p4.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int p4_hw_config(struct perf_event *event) 
		(p4_config_pack_escr(P4_ESCR_MASK_HT) |

		 p4_config_pack_cccr(P4_CCCR_MASK_HT));



	return 0;

	return x86_setup_perfctr(event);

}



static inline void p4_pmu_clear_cccr_ovf(struct hw_perf_event *hwc)