lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'tracing/core' into tracing/kprobes

Browse Source 
Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b74787:
	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>
This commit is contained in:
Frederic Weisbecker
2009-09-11 01:09:23 +02:00
parent 7006957732 d28daf923a
commit 8f8ffe2485
614 changed files with 7576 additions and 4327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/trace_export.c
View File

@ -120,7 +120,7 @@ ftrace_format_##call(struct ftrace_event_call *unused, \
static int ftrace_raw_init_event(struct ftrace_event_call *event_call)
{
INIT_LIST_HEAD(&event_call->fields);
init_preds(event_call);
return 0;
}
@ -137,7 +137,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \
.raw_init = ftrace_raw_init_event, \
.show_format = ftrace_format_##call, \
.define_fields = ftrace_define_fields_##call, \
};
}; \
#undef TRACE_EVENT_FORMAT_NOFILTER
#define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct, \