Messages in this thread Patch in this message | | | Date | Tue, 24 Apr 2012 15:32:54 -0700 | From | Greg KH <> | Subject | [ 01/42] Perf: fix build breakage |
| |
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zeev Tarantov <zeev.tarantov@gmail.com>
[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>
--- tools/perf/util/hist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -165,8 +165,8 @@ struct hist_entry *__hists__add_entry(st * 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; }
| |