Module Name: src
Committed By: msaitoh
Date: Thu Dec 11 10:07:45 UTC 2014
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Add newline if ci_tsc_freq is 0 to not to break the output.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.62 src/usr.sbin/cpuctl/arch/i386.c:1.63
--- src/usr.sbin/cpuctl/arch/i386.c:1.62 Thu Nov 20 10:31:10 2014
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Dec 11 10:07:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.62 2014/11/20 10:31:10 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.62 2014/11/20 10:31:10 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1836,9 +1836,10 @@ identifycpu(int fd, const char *cpuname)
aprint_normal(" (%s-class)", classnames[class]);
if (ci->ci_tsc_freq != 0)
- aprint_normal(", %ju.%02ju MHz\n",
+ aprint_normal(", %ju.%02ju MHz",
((uintmax_t)ci->ci_tsc_freq + 4999) / 1000000,
(((uintmax_t)ci->ci_tsc_freq + 4999) / 10000) % 100);
+ aprint_normal("\n");
aprint_normal_dev(ci->ci_dev, "family %#x model %#x stepping %#x",
ci->ci_family, ci->ci_model, CPUID_TO_STEPPING(ci->ci_signature));
