svn commit: r260557 - in head/sys: amd64/amd64 i386/i386

Gavin Atkinson gavin at FreeBSD.org
Sat Jan 11 22:41:11 UTC 2014


Author: gavin
Date: Sat Jan 11 22:41:10 2014
New Revision: 260557
URL: http://svnweb.freebsd.org/changeset/base/260557

Log:
  Remove spaces from boot messages when we print the CPU ID/Family/Stepping
  to match the rest of the CPU identification lines, and once again fit
  into 80 columns in the usual case.

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	Sat Jan 11 22:00:16 2014	(r260556)
+++ head/sys/amd64/amd64/identcpu.c	Sat Jan 11 22:41:10 2014	(r260557)
@@ -206,16 +206,16 @@ printcpuinfo(void)
 	}
 	printf("-class CPU)\n");
 	if (*cpu_vendor)
-		printf("  Origin = \"%s\"", cpu_vendor);
+		printf("  Origin=\"%s\"", cpu_vendor);
 	if (cpu_id)
-		printf("  Id = 0x%x", cpu_id);
+		printf("  Id=0x%x", cpu_id);
 
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
 	    cpu_vendor_id == CPU_VENDOR_CENTAUR) {
-		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);
+		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);
 
 		/*
 		 * AMD CPUID Specification

Modified: head/sys/i386/i386/identcpu.c
==============================================================================
--- head/sys/i386/i386/identcpu.c	Sat Jan 11 22:00:16 2014	(r260556)
+++ head/sys/i386/i386/identcpu.c	Sat Jan 11 22:41:10 2014	(r260557)
@@ -676,9 +676,9 @@ printcpuinfo(void)
 	}
 	printf("-class CPU)\n");
 	if(*cpu_vendor)
-		printf("  Origin = \"%s\"",cpu_vendor);
+		printf("  Origin=\"%s\"",cpu_vendor);
 	if(cpu_id)
-		printf("  Id = 0x%x", cpu_id);
+		printf("  Id=0x%x", cpu_id);
 
 	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
 	    cpu_vendor_id == CPU_VENDOR_AMD ||
@@ -688,9 +688,9 @@ printcpuinfo(void)
 	    cpu_vendor_id == CPU_VENDOR_NSC ||
 		(cpu_vendor_id == CPU_VENDOR_CYRIX &&
 		 ((cpu_id & 0xf00) > 0x500))) {
-		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);
+		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);
 		/*


More information about the svn-src-head mailing list