diff options
author | Karel Zak | 2017-01-09 13:01:39 +0100 |
---|---|---|
committer | Karel Zak | 2017-01-09 13:04:41 +0100 |
commit | a3c455ac9b492b633b10e824ac496c1029c6eba2 (patch) | |
tree | d23958f1f679331769793c68a203c417d941c06b | |
parent | unshare: fix SYNOPSIS and usage() (diff) | |
download | kernel-qcow2-util-linux-a3c455ac9b492b633b10e824ac496c1029c6eba2.tar.gz kernel-qcow2-util-linux-a3c455ac9b492b633b10e824ac496c1029c6eba2.tar.xz kernel-qcow2-util-linux-a3c455ac9b492b633b10e824ac496c1029c6eba2.zip |
lscpu: add aarch64 specific names
It seems that aarch64 uses a different names for some /proc/cpuinfo
fields (e.g. intel: bogomips, flags, and aarch64: BogoMIPS, features, ...)
Addresses: https://github.com/karelzak/util-linux/issues/392
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | sys-utils/lscpu.c | 3 | ||||
-rw-r--r-- | tests/expected/lscpu/lscpu-armv7 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index df561ac7f..94cc00cf6 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -562,11 +562,14 @@ read_basicinfo(struct lscpu_desc *desc, struct lscpu_modifier *mod) else if (lookup(buf, "cpu MHz static", &desc->static_mhz)) ; /* s390 */ else if (lookup(buf, "flags", &desc->flags)) ; /* x86 */ else if (lookup(buf, "features", &desc->flags)) ; /* s390 */ + else if (lookup(buf, "Features", &desc->flags)) ; /* aarch64 */ else if (lookup(buf, "type", &desc->flags)) ; /* sparc64 */ else if (lookup(buf, "bogomips", &desc->bogomips)) ; + else if (lookup(buf, "BogoMIPS", &desc->bogomips)) ; /* aarch64 */ else if (lookup(buf, "bogomips per cpu", &desc->bogomips)) ; /* s390 */ else if (lookup(buf, "cpu", &desc->cpu)) ; else if (lookup(buf, "revision", &desc->revision)) ; + else if (lookup(buf, "CPU revision", &desc->revision)) ; /* aarch64 */ else if (lookup(buf, "max thread id", &desc->mtid)) ; /* s390 */ else if (lookup_cache(buf, desc)) ; else diff --git a/tests/expected/lscpu/lscpu-armv7 b/tests/expected/lscpu/lscpu-armv7 index 050578df5..6f7db2b6b 100644 --- a/tests/expected/lscpu/lscpu-armv7 +++ b/tests/expected/lscpu/lscpu-armv7 @@ -3,8 +3,11 @@ On-line CPU(s) list: 0,1 Thread(s) per core: 1 Core(s) per socket: 2 Socket(s): 1 +Model: 4 CPU max MHz: 1700.0000 CPU min MHz: 200.0000 +BogoMIPS: 1694.10 +Flags: swp half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfpv4 idiva idivt # The following is the parsable format, which can be fed to other # programs. Each different item in every column has an unique ID |