Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/sys/arch/xen/x86 Pullup the following revision to fix bui...



details:   https://anonhg.NetBSD.org/src/rev/a72c45750dca
branches:  netbsd-7
changeset: 799846:a72c45750dca
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Mar 07 08:17:19 2016 +0000

description:
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.

diffstat:

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

diffs (34 lines):

diff -r a3ff81bc5675 -r a72c45750dca 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;



Home | Main Index | Thread Index | Old Index