aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-12-21 01:27:35 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-28 04:33:06 -0500
commit07b139c8c81b97bbe55c68daf0cbeca8b1c609ca (patch)
treeea410cac398bef3cc6cc7e2d2dc3527b50aac6d1 /kernel/perf_event.c
parent659d8cfbb225f1fa5a4f8671a847ef3ab5a89660 (diff)
perf events: Remove CONFIG_EVENT_PROFILE
Quoted from Ingo: | This reminds me - i think we should eliminate CONFIG_EVENT_PROFILE - | it's an unnecessary Kconfig complication. If both PERF_EVENTS and | EVENT_TRACING is enabled we should expose generic tracepoints. | | Nor is it limited to event 'profiling', so it has become a misnomer as | well. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <4B2F1557.2050705@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 099bd662daa6..5b987b4a98a8 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4177,7 +4177,7 @@ static const struct pmu perf_ops_task_clock = {
4177 .read = task_clock_perf_event_read, 4177 .read = task_clock_perf_event_read,
4178}; 4178};
4179 4179
4180#ifdef CONFIG_EVENT_PROFILE 4180#ifdef CONFIG_EVENT_TRACING
4181 4181
4182void perf_tp_event(int event_id, u64 addr, u64 count, void *record, 4182void perf_tp_event(int event_id, u64 addr, u64 count, void *record,
4183 int entry_size) 4183 int entry_size)
@@ -4282,7 +4282,7 @@ static void perf_event_free_filter(struct perf_event *event)
4282{ 4282{
4283} 4283}
4284 4284
4285#endif /* CONFIG_EVENT_PROFILE */ 4285#endif /* CONFIG_EVENT_TRACING */
4286 4286
4287#ifdef CONFIG_HAVE_HW_BREAKPOINT 4287#ifdef CONFIG_HAVE_HW_BREAKPOINT
4288static void bp_perf_event_destroy(struct perf_event *event) 4288static void bp_perf_event_destroy(struct perf_event *event)