summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2009-10-23 19:36:18 -0400
committerIngo Molnar <mingo@elte.hu>2009-10-24 11:07:50 +0200
commit67b394f7f26d84edb7294cc6528ab7ca6daa2ad1 (patch)
tree3daea2ece0ff6eefc261cfdf42eb7b4a90a96799
parent3e69533b51930a7169235db2caf703884e6e3bbb (diff)
downloadlinux-stable-67b394f7f26d84edb7294cc6528ab7ca6daa2ad1.tar.gz
linux-stable-67b394f7f26d84edb7294cc6528ab7ca6daa2ad1.tar.bz2
linux-stable-67b394f7f26d84edb7294cc6528ab7ca6daa2ad1.zip
tracing: Fix comment typo and documentation example
Trivial patch to fix a documentation example and to fix a comment. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <20091023233646.871719877@goodmis.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--Documentation/trace/ftrace.txt2
-rw-r--r--kernel/trace/ring_buffer.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt
index 957b22fde2df..8179692fbb90 100644
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
@@ -1231,6 +1231,7 @@ something like this simple program:
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <string.h>
#define _STR(x) #x
#define STR(x) _STR(x)
@@ -1265,6 +1266,7 @@ const char *find_debugfs(void)
return NULL;
}
+ strcat(debugfs, "/tracing/");
debugfs_found = 1;
return debugfs;
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index d4ff01970547..217f6991184f 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2681,7 +2681,7 @@ unsigned long ring_buffer_entries(struct ring_buffer *buffer)
EXPORT_SYMBOL_GPL(ring_buffer_entries);
/**
- * ring_buffer_overrun_cpu - get the number of overruns in buffer
+ * ring_buffer_overruns - get the number of overruns in buffer
* @buffer: The ring buffer
*
* Returns the total number of overruns in the ring buffer