Author: trasz
Date: Thu Aug 13 18:46:31 2020
New Revision: 364204
URL: https://svnweb.freebsd.org/changeset/base/364204

Log:
  MFC r347030:
  
  Fix flags in cpuinfo.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/12/sys/compat/linprocfs/linprocfs.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/12/sys/compat/linprocfs/linprocfs.c  Thu Aug 13 18:42:10 2020        
(r364203)
+++ stable/12/sys/compat/linprocfs/linprocfs.c  Thu Aug 13 18:46:31 2020        
(r364204)
@@ -215,11 +215,11 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
        static char *flags[] = {
                "fpu",      "vme",     "de",       "pse",      "tsc",
                "msr",      "pae",     "mce",      "cx8",      "apic",
-               "sep",      "sep",     "mtrr",     "pge",      "mca",
-               "cmov",     "pat",     "pse36",    "pn",       "b19",
-               "b20",      "b21",     "mmxext",   "mmx",      "fxsr",
-               "xmm",      "sse2",    "b27",      "b28",      "b29",
-               "3dnowext", "3dnow"
+               "",         "sep",     "mtrr",     "pge",      "mca",
+               "cmov",     "pat",     "pse36",    "pn",       "clflush",
+               "",         "dts",     "acpi",     "mmx",      "fxsr",
+               "sse",      "sse2",    "ss",       "ht",       "tm",
+               "ia64",     "pbe"
        };
 
        static char *power_flags[] = {
@@ -287,7 +287,7 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
                    CPUID_TO_FAMILY(cpu_id), "yes");
                sbuf_cat(sb, "flags\t\t:");
                for (j = 0; j < nitems(flags); j++)
-                       if (cpu_feature & (1 << j))
+                       if (cpu_feature & (1 << j) && flags[j][0] != '\0')
                                sbuf_printf(sb, " %s", flags[j]);
                sbuf_cat(sb, "\n");
                sbuf_printf(sb,
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to