diff options
-rw-r--r-- | kernel/trace/trace_irqsoff.c | 2 | ||||
-rw-r--r-- | kernel/trace/trace_sched_switch.c | 2 | ||||
-rw-r--r-- | kernel/trace/trace_sched_wakeup.c | 2 | ||||
-rw-r--r-- | kernel/trace/trace_selftest.c | 4 | ||||
-rw-r--r-- | kernel/trace/trace_stat.c | 2 | ||||
-rw-r--r-- | kernel/trace/trace_sysprof.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index c6b442d88de8..9e5ebd844158 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * trace irqs off criticall timings | 2 | * trace irqs off critical timings |
3 | * | 3 | * |
4 | * Copyright (C) 2007-2008 Steven Rostedt <srostedt@redhat.com> | 4 | * Copyright (C) 2007-2008 Steven Rostedt <srostedt@redhat.com> |
5 | * Copyright (C) 2008 Ingo Molnar <mingo@redhat.com> | 5 | * Copyright (C) 2008 Ingo Molnar <mingo@redhat.com> |
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c index 30e14fe85896..82fbb5a2df89 100644 --- a/kernel/trace/trace_sched_switch.c +++ b/kernel/trace/trace_sched_switch.c | |||
@@ -93,7 +93,7 @@ static int tracing_sched_register(void) | |||
93 | ret = register_trace_sched_switch(probe_sched_switch); | 93 | ret = register_trace_sched_switch(probe_sched_switch); |
94 | if (ret) { | 94 | if (ret) { |
95 | pr_info("sched trace: Couldn't activate tracepoint" | 95 | pr_info("sched trace: Couldn't activate tracepoint" |
96 | " probe to kernel_sched_schedule\n"); | 96 | " probe to kernel_sched_switch\n"); |
97 | goto fail_deprobe_wake_new; | 97 | goto fail_deprobe_wake_new; |
98 | } | 98 | } |
99 | 99 | ||
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index 96d716485898..276c51aaf314 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c | |||
@@ -284,7 +284,7 @@ static void start_wakeup_tracer(struct trace_array *tr) | |||
284 | ret = register_trace_sched_switch(probe_wakeup_sched_switch); | 284 | ret = register_trace_sched_switch(probe_wakeup_sched_switch); |
285 | if (ret) { | 285 | if (ret) { |
286 | pr_info("sched trace: Couldn't activate tracepoint" | 286 | pr_info("sched trace: Couldn't activate tracepoint" |
287 | " probe to kernel_sched_schedule\n"); | 287 | " probe to kernel_sched_switch\n"); |
288 | goto fail_deprobe_wake_new; | 288 | goto fail_deprobe_wake_new; |
289 | } | 289 | } |
290 | 290 | ||
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index c72e749bcbef..01415f4edaa5 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
@@ -107,9 +107,9 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace, | |||
107 | func(); | 107 | func(); |
108 | 108 | ||
109 | /* | 109 | /* |
110 | * Some archs *cough*PowerPC*cough* add charachters to the | 110 | * Some archs *cough*PowerPC*cough* add characters to the |
111 | * start of the function names. We simply put a '*' to | 111 | * start of the function names. We simply put a '*' to |
112 | * accomodate them. | 112 | * accommodate them. |
113 | */ | 113 | */ |
114 | func_name = "*" STR(DYN_FTRACE_TEST_NAME); | 114 | func_name = "*" STR(DYN_FTRACE_TEST_NAME); |
115 | 115 | ||
diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c index eae9cef39291..39310e3434ee 100644 --- a/kernel/trace/trace_stat.c +++ b/kernel/trace/trace_stat.c | |||
@@ -30,7 +30,7 @@ struct tracer_stat_session { | |||
30 | struct dentry *file; | 30 | struct dentry *file; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | /* All of the sessions currently in use. Each stat file embeed one session */ | 33 | /* All of the sessions currently in use. Each stat file embed one session */ |
34 | static LIST_HEAD(all_stat_sessions); | 34 | static LIST_HEAD(all_stat_sessions); |
35 | static DEFINE_MUTEX(all_stat_sessions_mutex); | 35 | static DEFINE_MUTEX(all_stat_sessions_mutex); |
36 | 36 | ||
diff --git a/kernel/trace/trace_sysprof.c b/kernel/trace/trace_sysprof.c index 7c9a2d82a7d8..c771af4e8f1a 100644 --- a/kernel/trace/trace_sysprof.c +++ b/kernel/trace/trace_sysprof.c | |||
@@ -327,5 +327,5 @@ void init_tracer_sysprof_debugfs(struct dentry *d_tracer) | |||
327 | d_tracer, NULL, &sysprof_sample_fops); | 327 | d_tracer, NULL, &sysprof_sample_fops); |
328 | if (entry) | 328 | if (entry) |
329 | return; | 329 | return; |
330 | pr_warning("Could not create debugfs 'dyn_ftrace_total_info' entry\n"); | 330 | pr_warning("Could not create debugfs 'sysprof_sample_period' entry\n"); |
331 | } | 331 | } |