summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2006-05-09 09:38:36 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2006-05-09 09:38:36 +0000
commitbc70516ce7fda275ee07d2df0c02fe967143c3ec (patch)
tree630a7e58579e1170faf859b92cdaa76dc2813a22 /sys
parent1df08b092f209c882c23e10093784aeae6176d63 (diff)
Move the sti to after the memory write. We do not want execution of
this and microtime() to interleave. ok deraadt@ toby@ mickey@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/include/cpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 568a2ef2de5..9e7082860f6 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.75 2006/04/27 15:37:53 mickey Exp $ */
+/* $OpenBSD: cpu.h,v 1.76 2006/05/09 09:38:35 otto Exp $ */
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
/*-
@@ -261,9 +261,9 @@ extern u_quad_t pentium_base_tsc;
if (pentium_mhz) { \
__asm __volatile("cli\n" \
"rdtsc\n" \
- "sti\n" \
: "=A" (pentium_base_tsc) \
: ); \
+ __asm __volatile("sti"); \
} \
} while (0)
#endif