Deleted Added
full compact
pcpu.h (255331) pcpu.h (256073)
1/*-
2 * Copyright (c) Peter Wemm
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) Peter Wemm
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/i386/include/pcpu.h 255331 2013-09-06 22:17:02Z gibbs $
26 * $FreeBSD: head/sys/i386/include/pcpu.h 256073 2013-10-05 23:11:01Z gibbs $
27 */
28
29#ifndef _MACHINE_PCPU_H_
30#define _MACHINE_PCPU_H_
31
32#ifndef _SYS_CDEFS_H_
33#error "sys/cdefs.h is a prerequisite for this file"
34#endif

--- 22 unchanged lines hidden (view full) ---

57};
58
59#define PCPU_XEN_FIELDS \
60 ; \
61 u_int pc_cr3; /* track cr3 for R1/R3*/ \
62 vm_paddr_t *pc_pdir_shadow; \
63 uint64_t pc_processed_system_time; \
64 struct shadow_time_info pc_shadow_time; \
27 */
28
29#ifndef _MACHINE_PCPU_H_
30#define _MACHINE_PCPU_H_
31
32#ifndef _SYS_CDEFS_H_
33#error "sys/cdefs.h is a prerequisite for this file"
34#endif

--- 22 unchanged lines hidden (view full) ---

57};
58
59#define PCPU_XEN_FIELDS \
60 ; \
61 u_int pc_cr3; /* track cr3 for R1/R3*/ \
62 vm_paddr_t *pc_pdir_shadow; \
63 uint64_t pc_processed_system_time; \
64 struct shadow_time_info pc_shadow_time; \
65 char __pad[189]
65 char __pad[185]
66
67#else /* !XEN */
68
69#define PCPU_XEN_FIELDS \
70 ; \
66
67#else /* !XEN */
68
69#define PCPU_XEN_FIELDS \
70 ; \
71 char __pad[237]
71 char __pad[233]
72
73#endif
74
75#define PCPU_MD_FIELDS \
76 char pc_monitorbuf[128] __aligned(128); /* cache line */ \
77 struct pcpu *pc_prvspace; /* Self-reference */ \
78 struct pmap *pc_curpmap; \
79 struct i386tss pc_common_tss; \
80 struct segment_descriptor pc_common_tssd; \
81 struct segment_descriptor *pc_tss_gdt; \
82 struct segment_descriptor *pc_fsgs_gdt; \
83 int pc_currentldt; \
84 u_int pc_acpi_id; /* ACPI CPU id */ \
85 u_int pc_apic_id; \
86 int pc_private_tss; /* Flag indicating private tss*/\
72
73#endif
74
75#define PCPU_MD_FIELDS \
76 char pc_monitorbuf[128] __aligned(128); /* cache line */ \
77 struct pcpu *pc_prvspace; /* Self-reference */ \
78 struct pmap *pc_curpmap; \
79 struct i386tss pc_common_tss; \
80 struct segment_descriptor pc_common_tssd; \
81 struct segment_descriptor *pc_tss_gdt; \
82 struct segment_descriptor *pc_fsgs_gdt; \
83 int pc_currentldt; \
84 u_int pc_acpi_id; /* ACPI CPU id */ \
85 u_int pc_apic_id; \
86 int pc_private_tss; /* Flag indicating private tss*/\
87 u_int pc_cmci_mask /* MCx banks for CMCI */ \
87 u_int pc_cmci_mask; /* MCx banks for CMCI */ \
88 u_int pc_vcpu_id /* Xen vCPU ID */ \
88 PCPU_XEN_FIELDS
89
90#ifdef _KERNEL
91
92#ifdef lint
93
94extern struct pcpu *pcpup;
95

--- 165 unchanged lines hidden ---
89 PCPU_XEN_FIELDS
90
91#ifdef _KERNEL
92
93#ifdef lint
94
95extern struct pcpu *pcpup;
96

--- 165 unchanged lines hidden ---