aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPaul McQuade <tungstentide@gmail.com>2011-05-31 15:51:55 -0400
committerSteven Rostedt <rostedt@goodmis.org>2011-06-14 22:48:45 -0400
commitbd38c0e6f98326132a691d73b2056b426423c638 (patch)
tree4e7f9a0efcfdb23e564db51da275fd9234ffa84f /kernel
parentcf30cf67d6c7592c670ec946d89fc15ee0deb0eb (diff)
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@gmail.com> Signed-off-by: Paul McQuade <tungstentide@gmail.com> Link: http://lkml.kernel.org/r/4DE59711.3090900@gmail.com Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/ftrace.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 1ee417fcbfa5..e1538071660d 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -32,7 +32,6 @@
32 32
33#include <trace/events/sched.h> 33#include <trace/events/sched.h>
34 34
35#include <asm/ftrace.h>
36#include <asm/setup.h> 35#include <asm/setup.h>
37 36
38#include "trace_output.h" 37#include "trace_output.h"
@@ -82,8 +81,7 @@ static int ftrace_disabled __read_mostly;
82 81
83static DEFINE_MUTEX(ftrace_lock); 82static DEFINE_MUTEX(ftrace_lock);
84 83
85static struct ftrace_ops ftrace_list_end __read_mostly = 84static struct ftrace_ops ftrace_list_end __read_mostly = {
86{
87 .func = ftrace_stub, 85 .func = ftrace_stub,
88}; 86};
89 87
@@ -785,8 +783,7 @@ static void unregister_ftrace_profiler(void)
785 unregister_ftrace_graph(); 783 unregister_ftrace_graph();
786} 784}
787#else 785#else
788static struct ftrace_ops ftrace_profile_ops __read_mostly = 786static struct ftrace_ops ftrace_profile_ops __read_mostly = {
789{
790 .func = function_profile_call, 787 .func = function_profile_call,
791}; 788};
792 789