From: Karel Zak <kzak@redhat.com>
Date: Tue, 3 Nov 2020 09:13:27 +0000 (+0100)
Subject: lscpu: don't use section for extra caches
X-Git-Tag: v2.37-rc1~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7155a57d34f5ec53e2eb80e6b0c0f82def99e799;p=thirdparty%2Futil-linux.git

lscpu: don't use section for extra caches

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

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index dca441df08..c5620035d5 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1029,12 +1029,11 @@ static void print_summary(struct lscpu_cxt *cxt)
 			}
 			last = name;
 		}
-		sec = NULL;
 	}
 
-	/* Section: extra caches (s390, ...) */
 	if (cxt->necaches) {
-		sec = add_summary_e(tb, NULL, _("Extra caches:"));
+		if (!cxt->ncaches)
+			sec = add_summary_e(tb, NULL, _("Caches:"));
 
 		for (i = 0; i < cxt->necaches; i++) {
 			struct lscpu_cache *ca = &cxt->ecaches[i];
@@ -1054,6 +1053,7 @@ static void print_summary(struct lscpu_cxt *cxt)
 			}
 		}
 	}
+	sec = NULL;
 
 	/* Section: NUMA modes */
 	if (cxt->nnodes) {