[src/netbsd-6]: src/usr.sbin/cpuctl/arch Pull up following revision(s) (reque...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4831cc7cff42
branches:  netbsd-6
changeset: 773986:4831cc7cff42
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Apr 06 17:46:41 2012 +0000

description:
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

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r d42048802538 -r 4831cc7cff42 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Fri Apr 06 17:44:21 2012 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Fri Apr 06 17:46:41 2012 +0000
@@ -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 @@
                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]);