Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47812e00 authored by Thomas Richter's avatar Thomas Richter Committed by Arnaldo Carvalho de Melo
Browse files

perf s390: Fix reading cpuid model information 



Commit eca0fa28 (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: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Fixes: eca0fa28 ("perf record: Provide detailed information on s390 CPU")
Link: http://lkml.kernel.org/r/20180219102444.96900-1-tmricht@linux.vnet.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 11737ca9

tools/perf/arch/s390/util/header.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ int get_cpuid(char *buffer, size_t sz) 
			line2 = line + strlen(SYSINFO_MODEL);

			line2 = line + strlen(SYSINFO_MODEL);





			while ((cp = strtok_r(line2, "\n ", &line2))) {

			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);

						    "%s%s", model[0] ? "," : "", cp);

			}

			}

			break;

			break;