Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 174787cb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/urgent' of... 

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
parents 1d90f2e7 a8fb2608

kernel/trace/trace_event_perf.c

+3 −1
Original line number Diff line number Diff line
@@ -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;