summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-03-11 12:38:48 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-03-11 13:28:45 -0300
commit8b8ba4a9a5b04916858f79cee71873f973931649 (patch)
treec42f76dc40e01a5d539dd63f22eadbe696c96c49
parentec52d9765a0f3603c62b4238482bf38897e4d42f (diff)
downloadlinux-3.10-8b8ba4a9a5b04916858f79cee71873f973931649.tar.gz
linux-3.10-8b8ba4a9a5b04916858f79cee71873f973931649.tar.bz2
linux-3.10-8b8ba4a9a5b04916858f79cee71873f973931649.zip
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>
-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 4bf6e02c2b2..4976400a143 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,
if (!syme->skip) {
struct perf_evsel *evsel;
- syme->origin = origin;
evsel = perf_evlist__id2evsel(top.evlist, sample->id);
assert(evsel != NULL);
syme->count[evsel->idx]++;
diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c
index fcfb7776281..a11f60735a1 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)
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;
}
diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
index 96a78312c71..ba111b25e16 100644
--- a/tools/perf/util/top.h
+++ b/tools/perf/util/top.h
@@ -17,7 +17,6 @@ struct sym_entry {
unsigned long snap_count;
double weight;
int skip;
- u8 origin;
struct map *map;
unsigned long count[0];
};