hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Chris 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: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Chris Wilson 2009-07-06 09:31:33 +01:00 committed by Ingo Molnar
parent 9590b7ba3f
commit d4d7d0b954
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/Kconfig
View File

@ -962,7 +962,7 @@ config PERF_COUNTERS
config EVENT_PROFILE config EVENT_PROFILE
bool "Tracepoint profile sources" bool "Tracepoint profile sources"
depends on PERF_COUNTERS && EVENT_TRACER depends on PERF_COUNTERS && EVENT_TRACING
default y default y
endmenu endmenu

10
kernel/perf_counter.c
View File

@ -3671,7 +3671,7 @@ static const struct pmu perf_ops_task_clock = {
void perf_tpcounter_event(int event_id) void perf_tpcounter_event(int event_id)
{ {
struct perf_sample_data data = { struct perf_sample_data data = {
.regs = get_irq_regs(); .regs = get_irq_regs(),
.addr = 0, .addr = 0,
}; };
@ -3687,16 +3687,12 @@ extern void ftrace_profile_disable(int);
static void tp_perf_counter_destroy(struct perf_counter *counter) 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) static const struct pmu *tp_perf_counter_init(struct perf_counter *counter)
{ {
int event_id = perf_event_id(&counter->attr); if (ftrace_profile_enable(counter->attr.config))
int ret;
ret = ftrace_profile_enable(event_id);
if (ret)
return NULL; return NULL;
counter->destroy = tp_perf_counter_destroy; counter->destroy = tp_perf_counter_destroy;