aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2010-03-04 23:35:37 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2010-03-10 08:47:18 -0500
commit97d5a22005f38057b4bc0d95f81cd26510268794 (patch)
treeb981789b1cec8ac36527e52204e407b32efa0ea6 /kernel/perf_event.c
parentc530665c31c0140b74ca7689e7f836177796e5bd (diff)
perf: Drop the obsolete profile naming for trace events
Drop the obsolete "profile" naming used by perf for trace events. Perf can now do more than simple events counting, so generalize the API naming. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Masami Hiramatsu <mhiramat@redhat.com> Cc: Jason Baron <jbaron@redhat.com>
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r--kernel/perf_event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 45b4b6e55891..c502b18594cc 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4347,7 +4347,7 @@ static int perf_tp_event_match(struct perf_event *event,
4347 4347
4348static void tp_perf_event_destroy(struct perf_event *event) 4348static void tp_perf_event_destroy(struct perf_event *event)
4349{ 4349{
4350 ftrace_profile_disable(event->attr.config); 4350 perf_trace_disable(event->attr.config);
4351} 4351}
4352 4352
4353static const struct pmu *tp_perf_event_init(struct perf_event *event) 4353static const struct pmu *tp_perf_event_init(struct perf_event *event)
@@ -4361,7 +4361,7 @@ static const struct pmu *tp_perf_event_init(struct perf_event *event)
4361 !capable(CAP_SYS_ADMIN)) 4361 !capable(CAP_SYS_ADMIN))
4362 return ERR_PTR(-EPERM); 4362 return ERR_PTR(-EPERM);
4363 4363
4364 if (ftrace_profile_enable(event->attr.config)) 4364 if (perf_trace_enable(event->attr.config))
4365 return NULL; 4365 return NULL;
4366 4366
4367 event->destroy = tp_perf_event_destroy; 4367 event->destroy = tp_perf_event_destroy;