[src/netbsd-8]: src/sys/arch/x86 Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/74a615cdc834
branches:  netbsd-8
changeset: 434810:74a615cdc834
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 01 08:51:47 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #681):
        sys/arch/x86/include/cpu.h: revision 1.90
        sys/arch/x86/x86/identcpu.c: revision 1.71
Retrieve cpuid.7:%edx.

diffstat:

 sys/arch/x86/include/cpu.h  |  5 +++--
 sys/arch/x86/x86/identcpu.c |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r ee80614628ef -r 74a615cdc834 sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h        Sun Apr 01 08:48:39 2018 +0000
+++ b/sys/arch/x86/include/cpu.h        Sun Apr 01 08:51:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.71.2.4 2018/03/22 16:59:04 martin Exp $      */
+/*     $NetBSD: cpu.h,v 1.71.2.5 2018/04/01 08:51:47 martin Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -177,7 +177,7 @@
        uint32_t        ci_max_ext_cpuid; /* cpuid.80000000:%eax */
        volatile uint32_t       ci_lapic_counter;
 
-       uint32_t        ci_feat_val[7]; /* X86 CPUID feature bits */
+       uint32_t        ci_feat_val[8]; /* X86 CPUID feature bits */
                        /* [0] basic features cpuid.1:%edx
                         * [1] basic features cpuid.1:%ecx (CPUID2_xxx bits)
                         * [2] extended features cpuid:80000001:%edx
@@ -185,6 +185,7 @@
                         * [4] VIA padlock features
                         * [5] structured extended features cpuid.7:%ebx
                         * [6] structured extended features cpuid.7:%ecx
+                        * [7] structured extended features cpuid.7:%edx
                         */
        
        const struct cpu_functions *ci_func;  /* start/stop functions */
diff -r ee80614628ef -r 74a615cdc834 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Sun Apr 01 08:48:39 2018 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Sun Apr 01 08:51:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.55.2.2 2018/03/16 13:05:32 martin Exp $ */
+/*     $NetBSD: identcpu.c,v 1.55.2.3 2018/04/01 08:51:47 martin Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.55.2.2 2018/03/16 13:05:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.55.2.3 2018/04/01 08:51:47 martin Exp $");
 
 #include "opt_xen.h"
 
@@ -889,6 +889,7 @@
                x86_cpuid(7, descs);
                ci->ci_feat_val[5] = descs[1]; /* %ebx */
                ci->ci_feat_val[6] = descs[2]; /* %ecx */
+               ci->ci_feat_val[7] = descs[3]; /* %edx */
        }
 
        cpu_probe_intel(ci);