diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 07:54:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 07:54:29 -0700 |
| commit | 7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b (patch) | |
| tree | a6f9970cebfb573a74a4abd06ff9caee41460e9a /Documentation | |
| parent | 0cb77508252e2d0e00c5ec7e57b4be9b3f7eb24d (diff) | |
| parent | cb16b91a449afd01b85ec4e59f30449d11c4acd7 (diff) | |
| download | linux-3.10-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.tar.gz linux-3.10-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.tar.bz2 linux-3.10-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc minor fixes mostly related to tracing"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
s390: Fix a header dependencies related build error
tracing: update documentation of snapshot utility
tracing: Do not return EINVAL in snapshot when not allocated
tracing: Add help of snapshot feature when snapshot is empty
ftrace: Update the kconfig for DYNAMIC_FTRACE
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/trace/ftrace.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/trace/ftrace.txt b/Documentation/trace/ftrace.txt index 53d6a3c51d8..a372304aef1 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 | --------------+------------+------------+------------+ |