Merge commit 'tracing/core' into tracing/kprobes

Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b74787eaf7858c6c573353a83c3e2766e674:
	tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index f75faeccf68e..a79ef6f193c0 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -120,7 +120,7 @@ ftrace_format_##call(struct ftrace_event_call *unused,			\
 static int ftrace_raw_init_event(struct ftrace_event_call *event_call)
 {
         INIT_LIST_HEAD(&event_call->fields);
-        init_preds(event_call);
+
         return 0;
 }
 
@@ -137,7 +137,7 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
         .raw_init               = ftrace_raw_init_event,                \
         .show_format            = ftrace_format_##call,                 \
         .define_fields          = ftrace_define_fields_##call,          \
-};
+};                                                                      \
 
 #undef TRACE_EVENT_FORMAT_NOFILTER
 #define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct,    \