Module Name: src
Committed By: martin
Date: Tue Mar 20 17:18:28 UTC 2018
Modified Files:
src/sys/arch/xen/x86 [netbsd-7-0]: cpu.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.98.4.1 -r1.98.4.1.2.1 src/sys/arch/xen/x86/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.98.4.1 src/sys/arch/xen/x86/cpu.c:1.98.4.1.2.1
--- src/sys/arch/xen/x86/cpu.c:1.98.4.1 Tue Aug 4 18:12:28 2015
+++ src/sys/arch/xen/x86/cpu.c Tue Mar 20 17:18:28 2018
@@ -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 phycpu_info_primary __al
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;
