From: Karel Zak Date: Tue, 3 Nov 2020 10:39:58 +0000 (+0100) Subject: lscpu: fix MHZ parsing X-Git-Tag: v2.37-rc1~301 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05b9c556f688eb7f2dc982e9088e778c6eea5f49;p=thirdparty%2Futil-linux.git lscpu: fix MHZ parsing Signed-off-by: Karel Zak --- diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c index 706f1c779a..b71f571697 100644 --- a/sys-utils/lscpu-cputype.c +++ b/sys-utils/lscpu-cputype.c @@ -221,9 +221,9 @@ static const struct cpuinfo_pattern cpu_patterns[] = { /* Sort by fields name! */ DEF_PAT_CPU( "bogomips", PAT_BOGOMIPS_CPU, bogomips), + DEF_PAT_CPU( "cpu MHz", PAT_MHZ, mhz), DEF_PAT_CPU( "cpu MHz dynamic", PAT_MHZ_DYNAMIC, dynamic_mhz), /* s390 */ DEF_PAT_CPU( "cpu MHz static", PAT_MHZ_STATIC, static_mhz), /* s390 */ - DEF_PAT_CPU( "cpu MHz", PAT_MHZ, mhz), DEF_PAT_CPU( "cpu number", PAT_PROCESSOR, logical_id), /* s390 */ DEF_PAT_CPU( "processor", PAT_PROCESSOR, logical_id), @@ -330,7 +330,6 @@ static const struct cpuinfo_pattern *cpuinfo_parse_line(char *str, char **value, return NULL; key.pattern = key_cleanup(buf, keynum); - /* CPU-type */ if ((pat = bsearch(&key, type_patterns, ARRAY_SIZE(type_patterns),