From 5f44a8d21b9731e90b6f96266ed51b803ca955d4 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Tue, 11 Aug 2009 17:42:52 +0200 Subject: [PATCH] --- yaml --- r: 158433 b: refs/heads/master c: e8f9f4d79a677f55c8ec3acbe87b33a87e2df0de h: refs/heads/master i: 158431: 2457e4de6671d86e44bcf6b118cf64c69c56d73e v: v3 --- [refs] | 2 +- trunk/include/linux/ftrace_event.h | 3 ++- trunk/include/trace/ftrace.h | 3 ++- trunk/kernel/trace/trace_events.c | 2 +- trunk/kernel/trace/trace_export.c | 6 ++++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fd7293e43e8e..a915648107e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ac676fb50f5f8a22e5e80afc40bf38e31b77c00 +refs/heads/master: e8f9f4d79a677f55c8ec3acbe87b33a87e2df0de diff --git a/trunk/include/linux/ftrace_event.h b/trunk/include/linux/ftrace_event.h index 8544f121d9f1..189806b6e69e 100644 --- a/trunk/include/linux/ftrace_event.h +++ b/trunk/include/linux/ftrace_event.h @@ -116,7 +116,8 @@ struct ftrace_event_call { void (*unregfunc)(void *); int id; int (*raw_init)(void); - int (*show_format)(struct trace_seq *s); + int (*show_format)(struct ftrace_event_call *call, + struct trace_seq *s); int (*define_fields)(void); struct list_head fields; int filter_active; diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index 46d81b5e8610..b250b0616571 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -151,7 +151,8 @@ #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ static int \ -ftrace_format_##call(struct trace_seq *s) \ +ftrace_format_##call(struct ftrace_event_call *unused, \ + struct trace_seq *s) \ { \ struct ftrace_raw_##call field __attribute__((unused)); \ int ret = 0; \ diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index 1d289e2d6693..b568ade8f453 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -576,7 +576,7 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt, trace_seq_printf(s, "format:\n"); trace_write_header(s); - r = call->show_format(s); + r = call->show_format(call, s); if (!r) { /* * ug! The format output is bigger than a PAGE!! diff --git a/trunk/kernel/trace/trace_export.c b/trunk/kernel/trace/trace_export.c index d06cf898dc86..956d4bc675e5 100644 --- a/trunk/kernel/trace/trace_export.c +++ b/trunk/kernel/trace/trace_export.c @@ -60,7 +60,8 @@ extern void __bad_type_size(void); #undef TRACE_EVENT_FORMAT #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \ static int \ -ftrace_format_##call(struct trace_seq *s) \ +ftrace_format_##call(struct ftrace_event_call *unused, \ + struct trace_seq *s) \ { \ struct args field; \ int ret; \ @@ -76,7 +77,8 @@ ftrace_format_##call(struct trace_seq *s) \ #define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct, \ tpfmt) \ static int \ -ftrace_format_##call(struct trace_seq *s) \ +ftrace_format_##call(struct ftrace_event_call *unused, \ + struct trace_seq *s) \ { \ struct args field; \ int ret; \