diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:45:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:45:39 -0400 |
| commit | fbdd17ec5ce2e5e4027356fcfde769b88d15702f (patch) | |
| tree | d655577d9bb40b7c9a03d35b513fd9a1bbfe431d /tools/perf/Documentation/perf-top.txt | |
| parent | 740c699a8d316c8bf8593f19e2ca47795e690622 (diff) | |
| parent | 90f6bb6c98ffef42125d7be6d4612505f561fbce (diff) | |
Merge branch 'perf-core-for-mingo' into perf/urgent
Conflicts:
tools/perf/bench/numa.c
Pull perf fixes from Jiri Olsa.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/Documentation/perf-top.txt')
| -rw-r--r-- | tools/perf/Documentation/perf-top.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt index cdd8d4946dba..976b00c6cdb1 100644 --- a/tools/perf/Documentation/perf-top.txt +++ b/tools/perf/Documentation/perf-top.txt | |||
| @@ -87,7 +87,6 @@ Default is to monitor all CPUS. | |||
| 87 | --realtime=<priority>:: | 87 | --realtime=<priority>:: |
| 88 | Collect data with this RT SCHED_FIFO priority. | 88 | Collect data with this RT SCHED_FIFO priority. |
| 89 | 89 | ||
| 90 | -s <symbol>:: | ||
| 91 | --sym-annotate=<symbol>:: | 90 | --sym-annotate=<symbol>:: |
| 92 | Annotate this symbol. | 91 | Annotate this symbol. |
| 93 | 92 | ||