The following commit has been merged in the linux branch: commit 67b394f7f26d84edb7294cc6528ab7ca6daa2ad1 Author: Jiri Olsa jolsa@redhat.com Date: Fri Oct 23 19:36:18 2009 -0400

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

diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt index 957b22f..8179692 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 d4ff019..217f699 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