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, 0 insertions, 2 deletions

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 646102eeff92..317d913a1488 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -177,7 +177,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \
                 event_enter_##sname.id = id;                            \
                 set_syscall_enter_id(num, id);                          \
                 INIT_LIST_HEAD(&event_enter_##sname.fields);            \
-                init_preds(&event_enter_##sname);                       \
                 return 0;                                               \
         }                                                               \
         TRACE_SYS_ENTER_PROFILE(sname);                                 \
@@ -214,7 +213,6 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \
                 event_exit_##sname.id = id;                             \
                 set_syscall_exit_id(num, id);                           \
                 INIT_LIST_HEAD(&event_exit_##sname.fields);             \
-                init_preds(&event_exit_##sname);                        \
                 return 0;                                               \
         }                                                               \
         TRACE_SYS_EXIT_PROFILE(sname);                                  \