From: Ingo Molnar Date: Wed, 26 Aug 2009 06:29:02 +0000 (+0200) Subject: Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... X-Git-Tag: v2.6.33-rc1~48^2~380 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35dce1a99d010f3d738af4ce1b9b77302fdfe69c;p=platform%2Fkernel%2Flinux-stable.git Merge branch 'tracing/core' of git://git./linux/kernel/git/frederic/random-tracing into tracing/core Conflicts: include/linux/tracepoint.h Signed-off-by: Ingo Molnar --- 35dce1a99d010f3d738af4ce1b9b77302fdfe69c diff --cc include/linux/tracepoint.h index 0341f2e,846a4ae..63a3f7a --- a/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)) + #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) */