From: Greg Kroah-Hartman Date: Mon, 23 Apr 2012 16:29:31 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.30~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1a491194f43ec2fa8c4d81a091e1804c704c488;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: perf-fix-build-breakage.patch --- diff --git a/queue-3.0/perf-fix-build-breakage.patch b/queue-3.0/perf-fix-build-breakage.patch new file mode 100644 index 00000000000..0b5d3bd8fae --- /dev/null +++ b/queue-3.0/perf-fix-build-breakage.patch @@ -0,0 +1,54 @@ +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 +@@ -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; + } diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..4c03d30eab1 --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1 @@ +perf-fix-build-breakage.patch