diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-16 13:42:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-16 13:44:06 +0100 |
| commit | 8b7cdd08fe304b41a2399eaaa5225159ac6db0d8 (patch) | |
| tree | 77aecdeaf0a9127717211d27c0fdff6e357846e4 /tools/perf/util/top.c | |
| parent | d10902812c9cd5583130a4ebb9ad19c60b68149d (diff) | |
| parent | 43adec955edd116c3e98c6e2f85fbd63281f5221 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
Diffstat (limited to 'tools/perf/util/top.c')
| -rw-r--r-- | tools/perf/util/top.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c index 75cfe4d4511..a11f60735a1 100644 --- a/tools/perf/util/top.c +++ b/tools/perf/util/top.c @@ -171,7 +171,7 @@ float perf_top__decay_samples(struct perf_top *top, struct rb_root *root) { struct sym_entry *syme, *n; float sum_ksamples = 0.0; - int snap = !top->display_weighted ? top->sym_counter : 0, j; + int snap = !top->display_weighted ? top->sym_evsel->idx : 0, j; /* Sort the active symbols */ pthread_mutex_lock(&top->active_symbols_lock); @@ -184,9 +184,9 @@ float perf_top__decay_samples(struct perf_top *top, struct rb_root *root) if (syme->snap_count != 0) { if ((top->hide_user_symbols && - syme->origin == PERF_RECORD_MISC_USER) || + syme->map->dso->kernel == DSO_TYPE_USER) || (top->hide_kernel_symbols && - syme->origin == PERF_RECORD_MISC_KERNEL)) { + syme->map->dso->kernel == DSO_TYPE_KERNEL)) { perf_top__remove_active_sym(top, syme); continue; } |