diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-21 09:22:45 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-21 09:22:45 +0100 |
| commit | 14764b01a5576ce23a9d0c95a027049206a19cef (patch) | |
| tree | fa7f4e3b9b62598076baf7d312dd37d6c91b0d56 /kernel/trace/trace_event_perf.c | |
| parent | Merge git://git.linaro.org/nico/arm_security into devel-stable (diff) | |
| parent | [ARM] Kirkwood: add missing machine targets to defconfig (diff) | |
| download | wireguard-linux-14764b01a5576ce23a9d0c95a027049206a19cef.tar.xz wireguard-linux-14764b01a5576ce23a9d0c95a027049206a19cef.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'kernel/trace/trace_event_perf.c')
| -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; |