Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2013 22:43:08 +0000 (UTC)
From:      Dag-Erling Smørgrav <des@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r248390 - stable/8/sys/compat/linprocfs
Message-ID:  <201303162243.r2GMh81w036642@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: des
Date: Sat Mar 16 22:43:08 2013
New Revision: 248390
URL: http://svnweb.freebsd.org/changeset/base/248390

Log:
  MFH (r214982, r214985): fix CPU ID in /proc/cpuinfo.
  
  PR:             kern/56451
  Approved by:	re (kib)

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

Modified: stable/8/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/8/sys/compat/linprocfs/linprocfs.c	Sat Mar 16 22:40:20 2013	(r248389)
+++ stable/8/sys/compat/linprocfs/linprocfs.c	Sat Mar 16 22:43:08 2013	(r248390)
@@ -276,11 +276,12 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
 		sbuf_printf(sb,
 		    "processor\t: %d\n"
 		    "vendor_id\t: %.20s\n"
-		    "cpu family\t: %d\n"
-		    "model\t\t: %d\n"
+		    "cpu family\t: %u\n"
+		    "model\t\t: %u\n"
 		    "model name\t: %s\n"
-		    "stepping\t: %d\n",
-		    i, cpu_vendor, class, cpu, model, cpu_id & 0xf);
+		    "stepping\t: %u\n\n",
+		    i, cpu_vendor, CPUID_TO_FAMILY(cpu_id),
+		    CPUID_TO_MODEL(cpu_id), model, cpu_id & CPUID_STEPPING);
 		/* XXX per-cpu vendor / class / model / id? */
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303162243.r2GMh81w036642>