[src/trunk]: src/sys/arch/x86/include Move ci_vcpu under the #ifdef XEN secti...

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

details:   https://anonhg.NetBSD.org/src/rev/c2f5285b809a
branches:  trunk
changeset: 931364:c2f5285b809a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Apr 27 16:29:17 2020 +0000

description:
Move ci_vcpu under the #ifdef XEN section at the end of the struct cpu_info.
Hopefully will fix the nvmm module.

diffstat:

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

diffs (27 lines):

diff -r c461e7ee5d81 -r c2f5285b809a sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h        Mon Apr 27 14:07:22 2020 +0000
+++ b/sys/arch/x86/include/cpu.h        Mon Apr 27 16:29:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.122 2020/04/25 15:26:18 bouyer Exp $ */
+/*     $NetBSD: cpu.h,v 1.123 2020/04/27 16:29:17 bouyer Exp $ */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -111,9 +111,6 @@
        struct cpu_data ci_data;        /* MI per-cpu data */
        device_t ci_dev;                /* pointer to our device */
        struct cpu_info *ci_self;       /* self-pointer */
-#ifdef XEN
-       volatile struct vcpu_info *ci_vcpu; /* for XEN */
-#endif
 
        /*
         * Private members.
@@ -269,6 +266,7 @@
        struct evcnt ci_ipi_events[XEN_NIPIS];
 #endif
 #ifdef XEN
+       volatile struct vcpu_info *ci_vcpu; /* for XEN */
        u_long ci_evtmask[NR_EVENT_CHANNELS]; /* events allowed on this CPU */
        evtchn_port_t ci_ipi_evtchn;
 #if defined(XENPV)