Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Ingo Molnar [Wed, 26 Aug 2009 06:29:02 +0000 (08:29 +0200)]
Conflicts:
include/linux/tracepoint.h

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

1  2 
include/linux/tracepoint.h
include/trace/define_trace.h
include/trace/ftrace.h
kernel/trace/trace_syscalls.c

@@@ -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))
+ #define TRACE_EVENT_FN(name, proto, args, struct,             \
+               assign, print, reg, unreg)                      \
+       DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 -#endif
  
 -#endif
 +#endif /* ifdef TRACE_EVENT (see note above) */
Simple merge
Simple merge
Simple merge