summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_stat.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-18 01:09:07 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-18 01:09:07 +0100
commitac07bcaa8259841905ead3f8cd60b1923ca6c0e5 (patch)
tree162def1cd53ef477adca17fe06c33a484f6b2e87 /kernel/trace/trace_stat.c
parent37bd824a35a60abc73e5fa8816bd5f50c913d69b (diff)
parent35ebf1caa4854ad5ba25f3a72967acc064147994 (diff)
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_stat.c')
-rw-r--r--kernel/trace/trace_stat.c2
1 files changed, 1 insertions, 1 deletions
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 {
struct dentry *file;
};
-/* All of the sessions currently in use. Each stat file embeed one session */
+/* All of the sessions currently in use. Each stat file embed one session */
static LIST_HEAD(all_stat_sessions);
static DEFINE_MUTEX(all_stat_sessions_mutex);