aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-03-11 10:38:48 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-03-11 11:28:45 -0500
commit8b8ba4a9a5b04916858f79cee71873f973931649 (patch)
treec42f76dc40e01a5d539dd63f22eadbe696c96c49 /tools
parentec52d9765a0f3603c62b4238482bf38897e4d42f (diff)
perf top: Remove redundant syme->origin field
We can get it from syme->map->dso->kernel (that should be renamed to origin, but leave this for another patch). Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-top.c1
-rw-r--r--tools/perf/util/top.c4
-rw-r--r--tools/perf/util/top.h1
3 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 4bf6e02c2b2a..4976400a1438 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -782,7 +782,6 @@ static void perf_event__process_sample(const union perf_event *event,
782 if (!syme->skip) { 782 if (!syme->skip) {
783 struct perf_evsel *evsel; 783 struct perf_evsel *evsel;
784 784
785 syme->origin = origin;
786 evsel = perf_evlist__id2evsel(top.evlist, sample->id); 785 evsel = perf_evlist__id2evsel(top.evlist, sample->id);
787 assert(evsel != NULL); 786 assert(evsel != NULL);
788 syme->count[evsel->idx]++; 787 syme->count[evsel->idx]++;
diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c
index fcfb77762819..a11f60735a18 100644
--- a/tools/perf/util/top.c
+++ b/tools/perf/util/top.c
@@ -184,9 +184,9 @@ float perf_top__decay_samples(struct perf_top *top, struct rb_root *root)
184 if (syme->snap_count != 0) { 184 if (syme->snap_count != 0) {
185 185
186 if ((top->hide_user_symbols && 186 if ((top->hide_user_symbols &&
187 syme->origin == PERF_RECORD_MISC_USER) || 187 syme->map->dso->kernel == DSO_TYPE_USER) ||
188 (top->hide_kernel_symbols && 188 (top->hide_kernel_symbols &&
189 syme->origin == PERF_RECORD_MISC_KERNEL)) { 189 syme->map->dso->kernel == DSO_TYPE_KERNEL)) {
190 perf_top__remove_active_sym(top, syme); 190 perf_top__remove_active_sym(top, syme);
191 continue; 191 continue;
192 } 192 }
diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
index 96a78312c719..ba111b25e16a 100644
--- a/tools/perf/util/top.h
+++ b/tools/perf/util/top.h
@@ -17,7 +17,6 @@ struct sym_entry {
17 unsigned long snap_count; 17 unsigned long snap_count;
18 double weight; 18 double weight;
19 int skip; 19 int skip;
20 u8 origin;
21 struct map *map; 20 struct map *map;
22 unsigned long count[0]; 21 unsigned long count[0];
23}; 22};