diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 10:18:46 -0500 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-02-27 10:18:46 -0500 |
| commit | 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 (patch) | |
| tree | fadde2521591998dc653fa094c636e8a547e620d /tools/perf/builtin-top.c | |
| parent | 1dd2980d990068e20045b90c424518cc7f3657ff (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into perf/core
Merge reason:
__percpu annotations need the corresponding sparse address
space definition upstream.
Conflicts:
tools/perf/util/probe-event.c (trivial)
Diffstat (limited to 'tools/perf/builtin-top.c')
| -rw-r--r-- | tools/perf/builtin-top.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index c6706984b7b3..31f2e597800c 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c | |||
| @@ -706,7 +706,7 @@ static void print_mapped_keys(void) | |||
| 706 | fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0); | 706 | fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0); |
| 707 | 707 | ||
| 708 | fprintf(stdout, | 708 | fprintf(stdout, |
| 709 | "\t[K] hide kernel_symbols symbols. \t(%s)\n", | 709 | "\t[K] hide kernel_symbols symbols. \t(%s)\n", |
| 710 | hide_kernel_symbols ? "yes" : "no"); | 710 | hide_kernel_symbols ? "yes" : "no"); |
| 711 | fprintf(stdout, | 711 | fprintf(stdout, |
| 712 | "\t[U] hide user symbols. \t(%s)\n", | 712 | "\t[U] hide user symbols. \t(%s)\n", |