Pullup the following revision to fix build break caused by ticket #1118: netbsd-7
authormsaitoh <msaitoh@NetBSD.org>
Mon, 07 Mar 2016 08:17:19 +0000
branchnetbsd-7
changeset 254820 7e3618d3cea0
parent 254819 454d9e0c3d93
child 254821 d4231f428907
Pullup the following revision to fix build break caused by ticket #1118: sys/arch/xen/x86/cpu.c 1.102-1.103 Increase the number of entries of cpu_features from 5 to 7.
sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c	Mon Mar 07 08:08:52 2016 +0000
+++ b/sys/arch/xen/x86/cpu.c	Mon Mar 07 08:17:19 2016 +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.2 2016/03/07 08:17:19 msaitoh 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.2 2016/03/07 08:17:19 msaitoh 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;