[src/trunk]: src/sys/arch/x86/pci Calcurate the processor family correctly. T...

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

details:   https://anonhg.NetBSD.org/src/rev/2bd06dfdd798
branches:  trunk
changeset: 791297:2bd06dfdd798
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Nov 12 15:08:01 2013 +0000

description:
Calcurate the processor family correctly. The extended family bits
should be added only when the base family is 0xf.

diffstat:

 sys/arch/x86/pci/amdtemp.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 61f08d3141d4 -r 2bd06dfdd798 sys/arch/x86/pci/amdtemp.c
--- a/sys/arch/x86/pci/amdtemp.c        Tue Nov 12 14:32:03 2013 +0000
+++ b/sys/arch/x86/pci/amdtemp.c        Tue Nov 12 15:08:01 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: amdtemp.c,v 1.16 2012/07/16 01:52:37 pgoyette Exp $ */
+/*      $NetBSD: amdtemp.c,v 1.17 2013/11/12 15:08:01 msaitoh Exp $ */
 /*      $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $   */
 
 /*
@@ -48,7 +48,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.16 2012/07/16 01:52:37 pgoyette Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.17 2013/11/12 15:08:01 msaitoh Exp $ ");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -239,7 +239,8 @@
        KASSERT(cpu_signature != 0x0);
 
        sc->sc_family = CPUID2FAMILY(cpu_signature);
-       sc->sc_family += CPUID2EXTFAMILY(cpu_signature);
+       if (sc->sc_family == 0xf)
+               sc->sc_family += CPUID2EXTFAMILY(cpu_signature);
 
        KASSERT(sc->sc_family >= 0xf);