Commit-ID: 47812e00910407a0f14906c0a3bf2d803a616c6f Gitweb: https://git.kernel.org/tip/47812e00910407a0f14906c0a3bf2d803a616c6f Author: Thomas Richter <tmricht@xxxxxxxxxxxxxxxxxx> AuthorDate: Mon, 19 Feb 2018 11:24:44 +0100 Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> CommitDate: Mon, 19 Feb 2018 09:16:01 -0300 perf s390: Fix reading cpuid model information Commit eca0fa28cd0d (perf record: Provide detailed information on s390 CPU") fixed a build error on Ubuntu. However the fix uses the wrong size to print the model information. Signed-off-by: Thomas Richter <tmricht@xxxxxxxxxxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Fixes: eca0fa28cd0d ("perf record: Provide detailed information on s390 CPU") Link: http://lkml.kernel.org/r/20180219102444.96900-1-tmricht@xxxxxxxxxxxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> --- tools/perf/arch/s390/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/arch/s390/util/header.c b/tools/perf/arch/s390/util/header.c index 231294b..a4c30f1 100644 --- a/tools/perf/arch/s390/util/header.c +++ b/tools/perf/arch/s390/util/header.c @@ -81,7 +81,7 @@ int get_cpuid(char *buffer, size_t sz) line2 = line + strlen(SYSINFO_MODEL); while ((cp = strtok_r(line2, "\n ", &line2))) { - mdsize += scnprintf(model + mdsize, sizeof(type) - mdsize, + mdsize += scnprintf(model + mdsize, sizeof(model) - mdsize, "%s%s", model[0] ? "," : "", cp); } break; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |