diff --git a/[refs] b/[refs] index 8b6a3508c6a0..f72550f51476 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22a7c31a9659deaddafbbcec6562d44141e84474 +refs/heads/master: 48dd0fed90e2b1f1ba87401439b85942181c6df3 diff --git a/trunk/kernel/trace/trace_output.c b/trunk/kernel/trace/trace_output.c index 5fc51f0f75fc..8bd9a2c1a46a 100644 --- a/trunk/kernel/trace/trace_output.c +++ b/trunk/kernel/trace/trace_output.c @@ -541,7 +541,7 @@ int register_ftrace_event(struct trace_event *event) INIT_LIST_HEAD(&event->list); if (!event->type) { - struct list_head *list; + struct list_head *list = NULL; if (next_event_type > FTRACE_MAX_EVENT) {