aboutsummaryrefslogtreecommitdiffstats
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 05:07:50 -0400
commit67b394f7f26d84edb7294cc6528ab7ca6daa2ad1 (patch)
tree3daea2ece0ff6eefc261cfdf42eb7b4a90a96799
parent3e69533b51930a7169235db2caf703884e6e3bbb (diff)
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:
1231#include <sys/stat.h> 1231#include <sys/stat.h>
1232#include <fcntl.h> 1232#include <fcntl.h>
1233#include <unistd.h> 1233#include <unistd.h>
1234#include <string.h>
1234 1235
1235#define _STR(x) #x 1236#define _STR(x) #x
1236#define STR(x) _STR(x) 1237#define STR(x) _STR(x)
@@ -1265,6 +1266,7 @@ const char *find_debugfs(void)
1265 return NULL; 1266 return NULL;
1266 } 1267 }
1267 1268
1269 strcat(debugfs, "/tracing/");
1268 debugfs_found = 1; 1270 debugfs_found = 1;
1269 1271
1270 return debugfs; 1272 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)
2681EXPORT_SYMBOL_GPL(ring_buffer_entries); 2681EXPORT_SYMBOL_GPL(ring_buffer_entries);
2682 2682
2683/** 2683/**
2684 * ring_buffer_overrun_cpu - get the number of overruns in buffer 2684 * ring_buffer_overruns - get the number of overruns in buffer
2685 * @buffer: The ring buffer 2685 * @buffer: The ring buffer
2686 * 2686 *
2687 * Returns the total number of overruns in the ring buffer 2687 * Returns the total number of overruns in the ring buffer