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

+3 -1
+3 -1
kernel/trace/trace_event_perf.c
··· 96 96 mutex_lock(&event_mutex); 97 97 list_for_each_entry(tp_event, &ftrace_events, list) { 98 98 if (tp_event->event.type == event_id && 99 - tp_event->class && tp_event->class->perf_probe && 99 + tp_event->class && 100 + (tp_event->class->perf_probe || 101 + tp_event->class->reg) && 100 102 try_module_get(tp_event->mod)) { 101 103 ret = perf_trace_event_init(tp_event, p_event); 102 104 break;