1 files changed, 9 insertions, 3 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index c212a7f934ec..079a93ae8a9d 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -147,7 +147,8 @@ int trace_event_raw_init(struct ftrace_event_call *call)
 }
 EXPORT_SYMBOL_GPL(trace_event_raw_init);
 
-int ftrace_event_reg(struct ftrace_event_call *call, enum trace_reg type)
+int ftrace_event_reg(struct ftrace_event_call *call,
+                     enum trace_reg type, void *data)
 {
         switch (type) {
         case TRACE_REG_REGISTER:
@@ -170,6 +171,11 @@ int ftrace_event_reg(struct ftrace_event_call *call, enum trace_reg type)
                                             call->class->perf_probe,
                                             call);
                 return 0;
+        case TRACE_REG_PERF_OPEN:
+        case TRACE_REG_PERF_CLOSE:
+        case TRACE_REG_PERF_ADD:
+        case TRACE_REG_PERF_DEL:
+                return 0;
 #endif
         }
         return 0;
@@ -209,7 +215,7 @@ static int ftrace_event_enable_disable(struct ftrace_event_call *call,
                                 tracing_stop_cmdline_record();
                                 call->flags &= ~TRACE_EVENT_FL_RECORDED_CMD;
                         }
-                        call->class->reg(call, TRACE_REG_UNREGISTER);
+                        call->class->reg(call, TRACE_REG_UNREGISTER, NULL);
                 }
                 break;
         case 1:
@@ -218,7 +224,7 @@ static int ftrace_event_enable_disable(struct ftrace_event_call *call,
                                 tracing_start_cmdline_record();
                                 call->flags |= TRACE_EVENT_FL_RECORDED_CMD;
                         }
-                        ret = call->class->reg(call, TRACE_REG_REGISTER);
+                        ret = call->class->reg(call, TRACE_REG_REGISTER, NULL);
                         if (ret) {
                                 tracing_stop_cmdline_record();
                                 pr_info("event trace: Could not enable event "