---

yaml --- r: 364919 b: refs/heads/master c: 7e4f44b h: refs/heads/master i: 364917: af94793 364915: b376794 364911: 8c5d257 v: v3
git-mirror · Mar 15, 2013 · bc14a63 · bc14a63
1 parent 9d4fb47
commit bc14a63
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f71130de5c7fba92faf3901784714e37a234c08f
+refs/heads/master: 7e4f44b153e1ec07bb64c1c1671cdf492465bbf3
diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h
@@ -324,7 +324,7 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = {	\
 
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print)	\
-static int notrace							\
+static int notrace __init						\
 ftrace_define_fields_##call(struct ftrace_event_call *event_call)	\
 {									\
 	struct ftrace_raw_##call field;					\

diff --git a/trunk/kernel/trace/trace_export.c b/trunk/kernel/trace/trace_export.c
@@ -129,7 +129,7 @@ static void __always_unused ____ftrace_check_##name(void)		\
 
 #undef FTRACE_ENTRY
 #define FTRACE_ENTRY(name, struct_name, id, tstruct, print, filter)	\
-int									\
+static int __init							\
 ftrace_define_fields_##name(struct ftrace_event_call *event_call)	\
 {									\
 	struct struct_name field;					\