Module Name: src
Committed By: riz
Date: Fri Apr 6 17:46:41 UTC 2012
Modified Files:
src/usr.sbin/cpuctl/arch [netbsd-6]: i386.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #163):
usr.sbin/cpuctl/arch/i386.c: revision 1.30
report l3 cache information on AMD Family 10h and newer processors
To generate a diff of this commit:
cvs rdiff -u -r1.27.2.2 -r1.27.2.3 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.27.2.2 src/usr.sbin/cpuctl/arch/i386.c:1.27.2.3
--- src/usr.sbin/cpuctl/arch/i386.c:1.27.2.2 Wed Mar 7 23:26:01 2012
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Apr 6 17:46:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.27.2.2 2012/03/07 23:26:01 riz Exp $ */
+/* $NetBSD: i386.c,v 1.27.2.3 2012/04/06 17:46:41 riz 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.27.2.2 2012/03/07 23:26:01 riz Exp $");
+__RCSID("$NetBSD: i386.c,v 1.27.2.3 2012/04/06 17:46:41 riz Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1769,9 +1769,9 @@ amd_cpu_cacheinfo(struct cpu_info *ci)
cai->cai_associativity = 0; /* XXX Unknown/reserved */
/*
- * Determine L3 cache info on AMD Family 10h processors
+ * Determine L3 cache info on AMD Family 10h and newer processors
*/
- if (family == 0x10) {
+ if (family >= 0x10) {
cai = &ci->ci_cinfo[CAI_L3CACHE];
cai->cai_totalsize = AMD_L3_EDX_C_SIZE(descs[3]);
cai->cai_associativity = AMD_L3_EDX_C_ASSOC(descs[3]);
