]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lscpu: fix MHZ parsing
authorKarel Zak <kzak@redhat.com>
Tue, 3 Nov 2020 10:39:58 +0000 (11:39 +0100)
committerKarel Zak <kzak@redhat.com>
Fri, 13 Nov 2020 08:19:02 +0000 (09:19 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
sys-utils/lscpu-cputype.c

index 706f1c779a46c7003071bcc81e3c04ac2b8f19b6..b71f57169783c1740a8d064ceff3b5fcf8071876 100644 (file)
@@ -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),