Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

Conflicts:
	include/linux/tracepoint.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc include/linux/tracepoint.h
index 0341f2e2698ade32754e77c0717611918d2de044,846a4ae501eb8ba675da0b03274de9d26c7ee555..63a3f7a8058032e1069d96e73ce5749b76a8e8da
--- 1/include/linux/tracepoint.h
--- 2/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@@ -295,5 -273,9 +282,8 @@@ static inline void tracepoint_synchroni
  
  #define TRACE_EVENT(name, proto, args, struct, assign, print) \
        DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 -#endif
+ #define TRACE_EVENT_FN(name, proto, args, struct,             \
+               assign, print, reg, unreg)                      \
+       DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
  
 -#endif
 +#endif /* ifdef TRACE_EVENT (see note above) */

diff --cc include/trace/define_trace.h
Simple merge

diff --cc include/trace/ftrace.h
Simple merge

diff --cc kernel/trace/trace_syscalls.c
Simple merge