diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-11 10:18:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-11 10:18:06 +0200 |
| commit | 174787cb5144e5a45141ec7cb9d95ea29bbe22bb (patch) | |
| tree | f4d0e4dc19e025ff7da6b49073b95d1bebde187a | |
| parent | 1d90f2e707e75afdb6b644f774cf5e54dc9c33fc (diff) | |
| parent | a8fb2608053547bc3152ea61a5ec7cdfce5d942c (diff) | |
| download | talos-obmc-linux-174787cb5144e5a45141ec7cb9d95ea29bbe22bb.tar.gz talos-obmc-linux-174787cb5144e5a45141ec7cb9d95ea29bbe22bb.zip | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index e6f65887842c..8a2b73f7c068 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -96,7 +96,9 @@ int perf_trace_init(struct perf_event *p_event) mutex_lock(&event_mutex); list_for_each_entry(tp_event, &ftrace_events, list) { if (tp_event->event.type == event_id && - tp_event->class && tp_event->class->perf_probe && + tp_event->class && + (tp_event->class->perf_probe || + tp_event->class->reg) && try_module_get(tp_event->mod)) { ret = perf_trace_event_init(tp_event, p_event); break; |
