[tip:perf/urgent] perf header: Fix numa topology printing

From: tip-bot for Namhyung Kim
Date: Wed Nov 14 2012 - 01:27:10 EST


Commit-ID: 1234471e2d11e4ee47f6de452dd8b8aeb09b45de
Gitweb: http://git.kernel.org/tip/1234471e2d11e4ee47f6de452dd8b8aeb09b45de
Author: Namhyung Kim <namhyung@xxxxxxxxxx>
AuthorDate: Tue, 23 Oct 2012 22:44:49 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Tue, 30 Oct 2012 10:32:55 -0200

perf header: Fix numa topology printing

Andrew reported that the commit 7e94cfcc9d20 ("perf header: Use pre-
processed session env when printing") regresses the header output. It
was because of a missed string pointer calculation in the loop.

Reported-by: Andrew Jones <drjones@xxxxxxxxxx>
Tested-by: Andrew Jones <drjones@xxxxxxxxxx>
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Andrew Jones <drjones@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1350999890-6920-1-git-send-email-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/header.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 7daad23..566b84c 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1378,6 +1378,8 @@ static void print_numa_topology(struct perf_header *ph, int fd __maybe_unused,

str = tmp + 1;
fprintf(fp, "# node%u cpu list : %s\n", c, str);
+
+ str += strlen(str) + 1;
}
return;
error:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/