commit 1cb41fe7e34a43a1d27dfdb6d65699786dd44c20 in stable (v3.3.3) breaks perf
Subsystems (2)
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.
Greg wrote on G+ that those who did not test 3.3.3-rc1 have no right to complain, but I'm complaining anyway. :P
See trivial patch to fix this.
-Z.T.
P.S.
I don't need credit for the patch so it's ok if my diff doesn't apply because of messed up whitespace. Just fix it.
tools/perf/util/hist.c +2 -2
@@ -237,8 +237,8 @@ struct hist_entry *__hists__add_entry(struct hists *hists,* 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; }
Greg Kroah-Hartman
maintainerQuoted 20 lines · Zeev Tarantov
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:
(quoted diff) +5
-0+ 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.
Greg wrote on G+ that those who did not test 3.3.3-rc1 have no right to complain, but I'm complaining anyway. :P
Quoted 6 lines
See trivial patch to fix this.
-Z.T.
P.S.
I don't need credit for the patch so it's ok if my diff doesn't apply because of messed up whitespace. Just fix it.
Patch looks good to me, thanks for doing this, you are right in that I didn't test perf. I'll go queue this up right now.
greg k-h
Patch "Perf: fix build breakage" has been added to the 3.0-stable tree
In reply to Zeev TarantovThis is a note to let you know that I've just added the patch titled
Perf: fix build breakage
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-fix-build-breakage.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From [email protected] Sun Apr 22 23:38:36 2012
From: Zeev Tarantov <[email protected]>
Date: Mon, 23 Apr 2012 09:37:04 +0300
Subject: Perf: fix build breakage
To: "David S. Miller" <[email protected]>, Arnaldo Carvalho de Melo <[email protected]>, Greg Kroah-Hartman <[email protected]>, Linux Kernel Mailing List <[email protected]>
Message-ID: <20120423063704.GA3465@myhost>
Content-Disposition: inline
From: Zeev Tarantov <[email protected]>
[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.
--- tools/perf/util/hist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +2 -2
@@ -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; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.0/perf-fix-build-breakage.patch
Patch "Perf: fix build breakage" has been added to the 3.3-stable tree
In reply to Zeev TarantovThis is a note to let you know that I've just added the patch titled
Perf: fix build breakage
to the 3.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-fix-build-breakage.patch
and it can be found in the queue-3.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From [email protected] Sun Apr 22 23:38:36 2012
From: Zeev Tarantov <[email protected]>
Date: Mon, 23 Apr 2012 09:37:04 +0300
Subject: Perf: fix build breakage
To: "David S. Miller" <[email protected]>, Arnaldo Carvalho de Melo <[email protected]>, Greg Kroah-Hartman <[email protected]>, Linux Kernel Mailing List <[email protected]>
Message-ID: <20120423063704.GA3465@myhost>
Content-Disposition: inline
From: Zeev Tarantov <[email protected]>
[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.
--- tools/perf/util/hist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +2 -2
@@ -237,8 +237,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; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.3/perf-fix-build-breakage.patch