Module Name: src
Committed By: msaitoh
Date: Thu Jul 3 04:11:37 UTC 2014
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Exclude descriptor 0xff of CPUID leaf 2. 0xff means the cacheinfo is in leaf 4.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 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.55 src/usr.sbin/cpuctl/arch/i386.c:1.56
--- src/usr.sbin/cpuctl/arch/i386.c:1.55 Tue May 27 04:18:00 2014
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Jul 3 04:11:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.55 2014/05/27 04:18:00 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.56 2014/07/03 04:11:37 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.55 2014/05/27 04:18:00 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.56 2014/07/03 04:11:37 msaitoh Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -997,7 +997,7 @@ intel_cpu_cacheinfo(struct cpu_info *ci)
desc);
if (cai != NULL)
ci->ci_cinfo[cai->cai_index] = *cai;
- else if (verbose)
+ else if ((verbose != 0) && (desc != 0xff))
printf("Unknown cacheinfo desc %02x\n",
desc);
}
