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

Commit d4d7d0b9 authored by Chris Wilson's avatar Chris Wilson Committed by Ingo Molnar
Browse files

perf_counter: Fix the tracepoint channel to perfcounters 



Fix a missed rename in EVENT_PROFILE support so that it gets
built and allows tracepoint tracing from the 'perf' tool.

Fix a typo in the (never before built & enabled) portion in
perf_counter.c as well, and update that code to the
attr.config changes as well.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Ben Gamari <bgamari.foss@gmail.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1246869094-21237-1-git-send-email-chris@chris-wilson.co.uk>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9590b7ba

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ config PERF_COUNTERS 


config EVENT_PROFILE

	bool "Tracepoint profile sources"

	depends on PERF_COUNTERS && EVENT_TRACER

	depends on PERF_COUNTERS && EVENT_TRACING

	default y



endmenu

kernel/perf_counter.c

+3 −7
Original line number Diff line number Diff line
@@ -3671,7 +3671,7 @@ static const struct pmu perf_ops_task_clock = { 
void perf_tpcounter_event(int event_id)

{

	struct perf_sample_data data = {

		.regs = get_irq_regs();

		.regs = get_irq_regs(),

		.addr = 0,

	};
@@ -3687,16 +3687,12 @@ extern void ftrace_profile_disable(int); 


static void tp_perf_counter_destroy(struct perf_counter *counter)

{

	ftrace_profile_disable(perf_event_id(&counter->attr));

	ftrace_profile_disable(counter->attr.config);

}



static const struct pmu *tp_perf_counter_init(struct perf_counter *counter)

{

	int event_id = perf_event_id(&counter->attr);

	int ret;



	ret = ftrace_profile_enable(event_id);

	if (ret)

	if (ftrace_profile_enable(counter->attr.config))

		return NULL;



	counter->destroy = tp_perf_counter_destroy;