Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 21 Sep 2012 10:31:20 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240773 - in head/sys: amd64/amd64 i386/i386
Message-ID:  <201209211031.q8LAVKVC014601@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Fri Sep 21 10:31:19 2012
New Revision: 240773
URL: http://svn.freebsd.org/changeset/base/240773

Log:
  After r205013, amd64 and i386 CPU family and model IDs were printed out
  in hexadecimal, but without any 0x prefix, which can be very misleading.
  
  MFC after:	3 days

Modified:
  head/sys/amd64/amd64/identcpu.c
  head/sys/i386/i386/identcpu.c

Modified: head/sys/amd64/amd64/identcpu.c
==============================================================================
--- head/sys/amd64/amd64/identcpu.c	Fri Sep 21 03:09:23 2012	(r240772)
+++ head/sys/amd64/amd64/identcpu.c	Fri Sep 21 10:31:19 2012	(r240773)
@@ -213,8 +213,8 @@ printcpuinfo(void)
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {
-		printf("  Family = %x", CPUID_TO_FAMILY(cpu_id));
-		printf("  Model = %x", CPUID_TO_MODEL(cpu_id));
+		printf("  Family = 0x%x", CPUID_TO_FAMILY(cpu_id));
+		printf("  Model = 0x%x", CPUID_TO_MODEL(cpu_id));
 		printf("  Stepping = %u", cpu_id & CPUID_STEPPING);
 
 		/*

Modified: head/sys/i386/i386/identcpu.c
==============================================================================
--- head/sys/i386/i386/identcpu.c	Fri Sep 21 03:09:23 2012	(r240772)
+++ head/sys/i386/i386/identcpu.c	Fri Sep 21 10:31:19 2012	(r240773)
@@ -688,8 +688,8 @@ printcpuinfo(void)
 	    cpu_vendor_id == CPU_VENDOR_NSC ||
 		(cpu_vendor_id == CPU_VENDOR_CYRIX &&
 		 ((cpu_id & 0xf00) > 0x500))) {
-		printf("  Family = %x", CPUID_TO_FAMILY(cpu_id));
-		printf("  Model = %x", CPUID_TO_MODEL(cpu_id));
+		printf("  Family = 0x%x", CPUID_TO_FAMILY(cpu_id));
+		printf("  Model = 0x%x", CPUID_TO_MODEL(cpu_id));
 		printf("  Stepping = %u", cpu_id & CPUID_STEPPING);
 		if (cpu_vendor_id == CPU_VENDOR_CYRIX)
 			printf("\n  DIR=0x%04x", cyrix_did);

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