Module Name: src Committed By: bouyer Date: Mon Apr 27 16:29:17 UTC 2020
Modified Files: src/sys/arch/x86/include: cpu.h Log Message: Move ci_vcpu under the #ifdef XEN section at the end of the struct cpu_info. Hopefully will fix the nvmm module. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/arch/x86/include/cpu.h 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/x86/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.122 src/sys/arch/x86/include/cpu.h:1.123 --- src/sys/arch/x86/include/cpu.h:1.122 Sat Apr 25 15:26:18 2020 +++ src/sys/arch/x86/include/cpu.h Mon Apr 27 16:29:17 2020 @@ -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_info { 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 cpu_info { 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)