* Re: commit 1cb41fe7e34a43a1d27dfdb6d65699786dd44c20 in stable (v3.3.3) breaks perf
2012-04-23 6:37 commit 1cb41fe7e34a43a1d27dfdb6d65699786dd44c20 in stable (v3.3.3) breaks perf Zeev Tarantov
@ 2012-04-23 16:25 ` Greg Kroah-Hartman
2012-04-23 16:29 ` Patch "Perf: fix build breakage" has been added to the 3.0-stable tree gregkh
2012-04-23 16:29 ` Patch "Perf: fix build breakage" has been added to the 3.3-stable tree gregkh
2 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2012-04-23 16:25 UTC (permalink / raw)
To: Zeev Tarantov
Cc: David S. Miller, Arnaldo Carvalho de Melo,
Linux Kernel Mailing List
On Mon, Apr 23, 2012 at 09:37:04AM +0300, Zeev Tarantov wrote:
> 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.
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Patch "Perf: fix build breakage" has been added to the 3.0-stable tree
2012-04-23 6:37 commit 1cb41fe7e34a43a1d27dfdb6d65699786dd44c20 in stable (v3.3.3) breaks perf Zeev Tarantov
2012-04-23 16:25 ` Greg Kroah-Hartman
@ 2012-04-23 16:29 ` gregkh
2012-04-23 16:29 ` Patch "Perf: fix build breakage" has been added to the 3.3-stable tree gregkh
2 siblings, 0 replies; 4+ messages in thread
From: gregkh @ 2012-04-23 16:29 UTC (permalink / raw)
To: zeev.tarantov, acme, davem, gregkh, linux-kernel; +Cc: stable, stable-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=ASCII, Size: 2667 bytes --]
This 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 <stable@vger.kernel.org> know about it.
>From zeev.tarantov@gmail.com Sun Apr 22 23:38:36 2012
From: Zeev Tarantov <zeev.tarantov@gmail.com>
Date: Mon, 23 Apr 2012 09:37:04 +0300
Subject: Perf: fix build breakage
To: "David S. Miller" <davem@davemloft.net>, Arnaldo Carvalho de Melo <acme@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Message-ID: <20120423063704.GA3465@myhost>
Content-Disposition: inline
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;
}
Patches currently in stable-queue which might be from zeev.tarantov@gmail.com are
queue-3.0/perf-fix-build-breakage.patch
^ permalink raw reply [flat|nested] 4+ messages in thread* Patch "Perf: fix build breakage" has been added to the 3.3-stable tree
2012-04-23 6:37 commit 1cb41fe7e34a43a1d27dfdb6d65699786dd44c20 in stable (v3.3.3) breaks perf Zeev Tarantov
2012-04-23 16:25 ` Greg Kroah-Hartman
2012-04-23 16:29 ` Patch "Perf: fix build breakage" has been added to the 3.0-stable tree gregkh
@ 2012-04-23 16:29 ` gregkh
2 siblings, 0 replies; 4+ messages in thread
From: gregkh @ 2012-04-23 16:29 UTC (permalink / raw)
To: zeev.tarantov, acme, davem, gregkh, linux-kernel; +Cc: stable, stable-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=ASCII, Size: 2667 bytes --]
This 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 <stable@vger.kernel.org> know about it.
>From zeev.tarantov@gmail.com Sun Apr 22 23:38:36 2012
From: Zeev Tarantov <zeev.tarantov@gmail.com>
Date: Mon, 23 Apr 2012 09:37:04 +0300
Subject: Perf: fix build breakage
To: "David S. Miller" <davem@davemloft.net>, Arnaldo Carvalho de Melo <acme@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Message-ID: <20120423063704.GA3465@myhost>
Content-Disposition: inline
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
@@ -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 zeev.tarantov@gmail.com are
queue-3.3/perf-fix-build-breakage.patch
^ permalink raw reply [flat|nested] 4+ messages in thread