Commit-ID: bd38c0e6f98326132a691d73b2056b426423c638 Gitweb: http://git.kernel.org/tip/bd38c0e6f98326132a691d73b2056b426423c638 Author: Paul McQuade <tungstentide@xxxxxxxxx> AuthorDate: Tue, 31 May 2011 20:51:55 +0100 Committer: Steven Rostedt <rostedt@xxxxxxxxxxx> CommitDate: Tue, 14 Jun 2011 22:48:45 -0400 ftrace: Fixed an include coding style issue Removed <asm/ftrace.h> because <linux/ftrace.h> was already declared. Braces of struct's coding style fixed. Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Signed-off-by: Paul McQuade <tungstentide@xxxxxxxxx> Link: http://lkml.kernel.org/r/4DE59711.3090900@xxxxxxxxx Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- kernel/trace/ftrace.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 1ee417f..e153807 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -32,7 +32,6 @@ #include <trace/events/sched.h> -#include <asm/ftrace.h> #include <asm/setup.h> #include "trace_output.h" @@ -82,8 +81,7 @@ static int ftrace_disabled __read_mostly; static DEFINE_MUTEX(ftrace_lock); -static struct ftrace_ops ftrace_list_end __read_mostly = -{ +static struct ftrace_ops ftrace_list_end __read_mostly = { .func = ftrace_stub, }; @@ -785,8 +783,7 @@ static void unregister_ftrace_profiler(void) unregister_ftrace_graph(); } #else -static struct ftrace_ops ftrace_profile_ops __read_mostly = -{ +static struct ftrace_ops ftrace_profile_ops __read_mostly = { .func = function_profile_call, }; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html