From: Karel Zak <kzak@redhat.com>
Date: Tue, 3 Nov 2020 08:48:21 +0000 (+0100)
Subject: lscpu: fix for sparc64
X-Git-Tag: v2.37-rc1~306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4228e9de266b6fb9e5aa969626187f01d57384c;p=thirdparty%2Futil-linux.git

lscpu: fix for sparc64

We do not read CPUs from cpuinfo on sparc.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
index 86049b6a17..38a9a2afab 100644
--- a/sys-utils/lscpu-cputype.c
+++ b/sys-utils/lscpu-cputype.c
@@ -424,6 +424,8 @@ int lscpu_read_cpuinfo(struct lscpu_cxt *cxt)
 {
 	FILE *fp;
 	char buf[BUFSIZ];
+	size_t i;
+	struct lscpu_cputype *ct;
 	struct cpuinfo_parser _pr = { .cxt = cxt }, *pr = &_pr;
 
 	assert(cxt->npossibles);	/* lscpu_create_cpus() required */
@@ -520,6 +522,16 @@ int lscpu_read_cpuinfo(struct lscpu_cxt *cxt)
 	fclose(fp);
 	lscpu_sort_caches(cxt->ecaches, cxt->necaches);
 
+	/* Set the default type to CPUs which are missing (or not parsed)
+	 * in cpuinfo */
+	ct = lscpu_cputype_get_default(cxt);
+	for (i = 0; i < cxt->npossibles; i++) {
+		struct lscpu_cpu *cpu = cxt->cpus[i];
+
+		if (cpu && !cpu->type)
+			lscpu_cpu_set_type(cpu, ct);
+	}
+
 	return 0;
 }