forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	include/linux/tracepoint.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-08-26 08:29:02 +02:00
commit 35dce1a99d
19 changed files with 154 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/trace/ftrace.h
View file

@ -45,6 +45,15 @@
}; \
static struct ftrace_event_call event_##name
/* Callbacks are meaningless to ftrace. */
#undef TRACE_EVENT_FN
#define TRACE_EVENT_FN(name, proto, args, tstruct, \
assign, print, reg, unreg) \
TRACE_EVENT(name, TP_PROTO(proto), TP_ARGS(args), \
TP_STRUCT__entry(tstruct), \
TP_fast_assign(assign), \
TP_printk(print))
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)