From fe84d37d8424053dcc5aa4a45eef0fb1d860e586 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 14 Sep 2009 10:50:23 -0400 Subject: [PATCH] --- yaml --- r: 162968 b: refs/heads/master c: ec827c7ece8901044e6b3f92aeea489be9e1bcf7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 7 ++----- trunk/include/trace/ftrace.h | 4 ++-- trunk/kernel/trace/trace_events.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3803bcb693df..321dec101417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 983f2163e7fdf11a15e05816de243f93f07eafca +refs/heads/master: ec827c7ece8901044e6b3f92aeea489be9e1bcf7 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1505129ec5a0..8dca9d89c6c1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2118,16 +2118,13 @@ F: Documentation/filesystems/caching/ F: fs/fscache/ F: include/linux/fscache*.h -TRACING +FTRACE M: Steven Rostedt -M: Frederic Weisbecker -M: Ingo Molnar -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core S: Maintained F: Documentation/trace/ftrace.txt F: arch/*/*/*/ftrace.h F: arch/*/kernel/ftrace.c -F: include/*/ftrace.h include/trace/ include/linux/trace*.h +F: include/*/ftrace.h F: kernel/trace/ FUJITSU FR-V (FRV) PORT diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index 308bafd93325..fa8ce03f836c 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -254,7 +254,7 @@ ftrace_format_##call(struct ftrace_event_call *unused, \ #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, assign, print) \ -enum print_line_t \ +static enum print_line_t \ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ { \ struct trace_seq *s = &iter->seq; \ @@ -317,7 +317,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \ #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, func, print) \ -int \ +static int \ ftrace_define_fields_##call(struct ftrace_event_call *event_call) \ { \ struct ftrace_raw_##call field; \ diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index adbed124c3e7..0fa8f9faa61c 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -1154,7 +1154,7 @@ static int trace_module_notify(struct notifier_block *self, } #endif /* CONFIG_MODULES */ -struct notifier_block trace_module_nb = { +static struct notifier_block trace_module_nb = { .notifier_call = trace_module_notify, .priority = 0, };