diff options
author | Zeev Tarantov <zeev.tarantov@gmail.com> | 2012-04-23 09:37:04 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:04 -0700 |
commit | 26cf838583142c2f5c79f2edbad3331011438137 (patch) | |
tree | ebd004141f4bbb53a1b93f7f6e989c7ecce19b3e /tools | |
parent | 41f45f5e60e6db84898b609f7f62ace90f842fdd (diff) | |
download | kernel_samsung_espresso10-26cf838583142c2f5c79f2edbad3331011438137.zip kernel_samsung_espresso10-26cf838583142c2f5c79f2edbad3331011438137.tar.gz kernel_samsung_espresso10-26cf838583142c2f5c79f2edbad3331011438137.tar.bz2 |
Perf: fix build breakage
[Patch not needed upstream as this is a backport build bugfix - gregkh
gcc correctly complains:
util/hist.c: In function ‘__hists__add_entry’:
util/hist.c:240:27: error: invalid type argument of ‘->’ (have ‘struct hist_entry’)
util/hist.c:241:23: error: invalid type argument of ‘->’ (have ‘struct hist_entry’)
for this new code:
+ if (he->ms.map != entry->ms.map) {
+ he->ms.map = entry->ms.map;
+ if (he->ms.map)
+ he->ms.map->referenced = true;
+ }
because "entry" is a "struct hist_entry", not a pointer to a struct.
In mainline, "entry" is a pointer to struct passed as argument to the function.
So this is broken during backporting. But obviously not compile tested.
Signed-off-by: Zeev Tarantov <zeev.tarantov@gmail.com>
Cc: Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/util/hist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index d25fded..fb69599 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -165,8 +165,8 @@ struct hist_entry *__hists__add_entry(struct hists *self, * mis-adjust symbol addresses when computing * the history counter to increment. */ - if (he->ms.map != entry->ms.map) { - he->ms.map = entry->ms.map; + if (he->ms.map != entry.ms.map) { + he->ms.map = entry.ms.map; if (he->ms.map) he->ms.map->referenced = true; } |