[src/netbsd-7-0]: src/sys/arch/xen/x86 Additionally pull up the following for...

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

details:   https://anonhg.NetBSD.org/src/rev/2ff9822aaf32
branches:  netbsd-7-0
changeset: 801462:2ff9822aaf32
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Mar 20 17:18:28 2018 +0000

description:
Additionally pull up the following for ticket #1118:

        sys/arch/xen/x86/cpu.c  1.102-1.103

to unbreak the build (adjust cpu_feature declaration to changes in generic
x86 code).

diffstat:

 sys/arch/xen/x86/cpu.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r e9cdacf35c0f -r 2ff9822aaf32 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Mon Mar 19 16:55:50 2018 +0000
+++ b/sys/arch/xen/x86/cpu.c    Tue Mar 20 17:18:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.98.4.1 2015/08/04 18:12:28 snj Exp $ */
+/*     $NetBSD: cpu.c,v 1.98.4.1.2.1 2018/03/20 17:18:28 martin Exp $  */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.98.4.1 2015/08/04 18:12:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.98.4.1.2.1 2018/03/20 17:18:28 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -172,12 +172,14 @@
 struct cpu_info *cpu_info_list = &cpu_info_primary;
 struct cpu_info *phycpu_info_list = &phycpu_info_primary;
 
-uint32_t cpu_feature[5]; /* X86 CPUID feature bits
+uint32_t cpu_feature[7]; /* X86 CPUID feature bits
                          *     [0] basic features %edx
                          *     [1] basic features %ecx
                          *     [2] extended features %edx
                          *     [3] extended features %ecx
                          *     [4] VIA padlock features
+                         *     [5] structured extended features cpuid.7:%ebx
+                         *     [6] structured extended features cpuid.7:%ecx
                          */
 
 bool x86_mp_online;