From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754032Ab2DWQaI (ORCPT ); Mon, 23 Apr 2012 12:30:08 -0400 Received: from mail-pz0-f51.google.com ([209.85.210.51]:41223 "EHLO mail-pz0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753814Ab2DWQaG (ORCPT ); Mon, 23 Apr 2012 12:30:06 -0400 Subject: Patch "Perf: fix build breakage" has been added to the 3.3-stable tree To: zeev.tarantov@gmail.com, acme@redhat.com, davem@davemloft.net, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Cc: , From: Date: Mon, 23 Apr 2012 09:29:52 -0700 In-Reply-To: <20120423063704.GA3465@myhost> Message-ID: <13351985923099@kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ASCII Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 know about it. >>From zeev.tarantov@gmail.com Sun Apr 22 23:38:36 2012 From: Zeev Tarantov Date: Mon, 23 Apr 2012 09:37:04 +0300 Subject: Perf: fix build breakage To: "David S. Miller" , Arnaldo Carvalho de Melo , Greg Kroah-Hartman , Linux Kernel Mailing List Message-ID: <20120423063704.GA3465@myhost> Content-Disposition: inline From: Zeev Tarantov [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 Cc: Signed-off-by: David S. Miller Cc: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- 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