Ingo,

This is based on top of my last pull request for tip/perf/urgent.

Thanks,

Please pull the latest tip/perf/urgent-2 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/urgent-2

Head SHA1: 1abccd7419de9829bcdf9ab1f81d5f6cf74d55d3


Hiraku Toyooka (1):
      tracing: update documentation of snapshot utility

----
 Documentation/trace/ftrace.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 1abccd7419de9829bcdf9ab1f81d5f6cf74d55d3
Author: Hiraku Toyooka <hiraku.toyooka...@hitachi.com>
Date:   Fri Mar 8 16:32:25 2013 +0900

    tracing: update documentation of snapshot utility
    
    Now, "snapshot" file returns success on a reset of snapshot buffer
    even if the buffer wasn't allocated, instead of returning EINVAL.
    This patch updates snapshot desctiption according to the change.
    
    Link: http://lkml.kernel.org/r/51399409.4090...@hitachi.com
    
    Signed-off-by: Hiraku Toyooka <hiraku.toyooka...@hitachi.com>
    Signed-off-by: Steven Rostedt <rost...@goodmis.org>

diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt
index 53d6a3c..a372304 100644
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
@@ -1873,7 +1873,7 @@ feature:
 
        status\input  |     0      |     1      |    else    |
        --------------+------------+------------+------------+
-       not allocated |(do nothing)| alloc+swap |   EINVAL   |
+       not allocated |(do nothing)| alloc+swap |(do nothing)|
        --------------+------------+------------+------------+
        allocated     |    free    |    swap    |   clear    |
        --------------+------------+------------+------------+


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to