[3.5.y.z extended stable] Patch "perf tools: Fix cache event name generation" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    perf tools: Fix cache event name generation

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From d8e3975aea45bfc07d1bf0ea986b453087e321f6 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa at redhat.com>
Date: Wed, 5 Sep 2012 19:51:33 +0200
Subject: perf tools: Fix cache event name generation

commit 275ef3878f698941353780440fec6926107a320b upstream.

If the event name is specified with all 3 components, the last one
overwrites the previous one during the name composing within the
parse_events_add_cache function.

Fixing this by properly adjusting the string index.

Reported-by: Joel Uckelman <joel at lightboxtechnologies.com>
Signed-off-by: Jiri Olsa <jolsa at redhat.com>
Cc: Corey Ashford <cjashfor at linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Joel Uckelman <joel at lightboxtechnologies.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
LPU-Reference: 20120905175133.GA18352 at krava.brq.redhat.com
[ committer note: Remove the newline fix, done already in 42e1fb7 ]
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Cc: Vinson Lee <vlee at twopensource.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 tools/perf/util/parse-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index d2006bd..5f99cec 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -420,7 +420,7 @@ int parse_events_add_cache(struct list_head **list, int *idx,
 	for (i = 0; (i < 2) && (op_result[i]); i++) {
 		char *str = op_result[i];

-		snprintf(name + n, MAX_NAME_LEN - n, "-%s", str);
+		n += snprintf(name + n, MAX_NAME_LEN - n, "-%s", str);

 		if (cache_op == -1) {
 			cache_op = parse_aliases(str, hw_cache_op,
--
1.9.0