Module Name: src
Committed By: msaitoh
Date: Thu Dec 11 12:21:44 UTC 2014
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Don't print the microcode version if the ioctl failed to not to
print garbage.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 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.63 src/usr.sbin/cpuctl/arch/i386.c:1.64
--- src/usr.sbin/cpuctl/arch/i386.c:1.63 Thu Dec 11 10:07:45 2014
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Dec 11 12:21:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.63 2014/12/11 10:07:45 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.64 2014/12/11 12:21:44 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.63 2014/12/11 10:07:45 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.64 2014/12/11 12:21:44 msaitoh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1995,6 +1995,8 @@ identifycpu(int fd, const char *cpuname)
ucode_64.loader_version = ucode.loader_version;
if (ioctl(fd, IOC_CPU_UCODE_GET_VERSION_64, &ucode_64) < 0)
return;
+#else
+ return;
#endif
}
