aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64/include')
-rw-r--r--sys/amd64/include/atomic.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index cb899a62d62f..17ef468c432a 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -75,15 +75,19 @@ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v);
#else /* !KLD_MODULE */
-#if defined(SMP)
+/*
+ * For userland, assume the SMP case and use lock prefixes so that
+ * the binaries will run on both types of systems.
+ */
+#if defined(SMP) || !defined(_KERNEL)
#if defined(LOCORE)
#define MPLOCKED lock ;
#else /* !LOCORE */
#define MPLOCKED "lock ; "
#endif /* LOCORE */
-#else /* !SMP */
+#else /* SMP || !_KERNEL */
#define MPLOCKED
-#endif /* SMP */
+#endif /* SMP || !_KERNEL */
#if !defined(LOCORE)
/*