summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-02 23:13:29 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-02 23:13:29 +0000
commite4c712a2cec00ef7458522288fab74ddd6a3abd6 (patch)
tree8ed9079180ea6674fc04deaac891941a446ca9ac
parent85406bd452337bcaadb8d31587b28439447dc36f (diff)
make ci_flags volatile; some future MD code will depend on this.
ok kettenis
-rw-r--r--sys/arch/amd64/include/cpu.h4
-rw-r--r--sys/arch/i386/include/cpu.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index ef89b2c7c67..b2a1ab3cd7d 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.57 2010/09/28 20:27:54 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.58 2010/10/02 23:13:27 deraadt Exp $ */
/* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */
/*-
@@ -91,7 +91,7 @@ struct cpu_info {
int ci_mutex_level;
#endif
- u_int ci_flags;
+ volatile u_int ci_flags;
u_int32_t ci_ipis;
u_int32_t ci_feature_flags;
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 65f69dfcdd0..77a060fdf71 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.116 2010/09/28 20:27:54 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.117 2010/10/02 23:13:28 deraadt Exp $ */
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
/*-
@@ -111,7 +111,7 @@ struct cpu_info {
#endif
paddr_t ci_idle_pcb_paddr; /* PA of idle PCB */
- u_long ci_flags; /* flags; see below */
+ volatile u_long ci_flags; /* flags; see below */
u_int32_t ci_ipis; /* interprocessor interrupts pending */
int sc_apic_version;/* local APIC version */