dcavalca / rpms / util-linux

Forked from rpms/util-linux 2 years ago
Clone
Blob Blame History Raw
From 5b20e51f98798161138f0758af845c43931f59ba Mon Sep 17 00:00:00 2001
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Date: Fri, 11 Sep 2020 09:53:28 -0400
Subject: [PATCH 54/55] lscpu: show physical socket on aarch64 without ACPI
 PPTT

Show the number of physical socket even if the sysfs doesn't have
the physical socket information.
Note, lscpu cannot show the number of socket info for unprivileged
users because it needs to access the DMI table.

Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
 sys-utils/lscpu.c | 6 ++++--
 sys-utils/lscpu.h | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index a8b448fa0..45fcb08cf 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1850,8 +1850,10 @@ print_summary(struct lscpu_desc *desc, struct lscpu_modifier *mod)
 			}
 		} else {
 			if (desc->is_cluster) {
-				if (desc->nr_socket_on_cluster > 0)
-					add_summary_n(tb, _("Socket(s):"), desc->nr_socket_on_cluster);
+				int sockets = get_number_of_physical_sockets_from_dmi();
+
+				if (sockets)
+					add_summary_n(tb, _("Socket(s):"), sockets);
 				else
 					add_summary_s(tb, _("Socket(s):"), "-");
 
diff --git a/sys-utils/lscpu.h b/sys-utils/lscpu.h
index b190afd21..1aef8202d 100644
--- a/sys-utils/lscpu.h
+++ b/sys-utils/lscpu.h
@@ -160,7 +160,6 @@ struct lscpu_desc {
 	int		physcoresperchip;	/* Physical cores per chip */
 
 	int		is_cluster;
-	int		nr_socket_on_cluster;
 };
 
 enum {
-- 
2.29.2