diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -140,7 +140,7 @@
 #define	ATOMIC_STORE(TYPE)					\
 void		atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
 
-#else /* !KLD_MODULE && __GNUCLIKE_ASM */
+#else /* !__GNUCLIKE_ASM */
 
 /*
  * For userland, always use lock prefixes so that the binaries will run
@@ -428,7 +428,7 @@
 	__storeload_barrier();
 }
 
-#endif /* KLD_MODULE || !__GNUCLIKE_ASM */
+#endif /* !__GNUCLIKE_ASM */
 
 ATOMIC_ASM(set,	     char,  "orb %b1,%0",  "iq",  v);
 ATOMIC_ASM(clear,    char,  "andb %b1,%0", "iq", ~v);
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -138,7 +138,7 @@
 void		atomic_add_64(volatile uint64_t *, uint64_t);
 void		atomic_subtract_64(volatile uint64_t *, uint64_t);
 
-#else /* !KLD_MODULE && __GNUCLIKE_ASM */
+#else /* !__GNUCLIKE_ASM */
 
 /*
  * For userland, always use lock prefixes so that the binaries will run
@@ -650,7 +650,7 @@
 
 #endif /* _KERNEL */
 
-#endif /* KLD_MODULE || !__GNUCLIKE_ASM */
+#endif /* !__GNUCLIKE_ASM */
 
 ATOMIC_ASM(set,	     char,  "orb %b1,%0",  "iq",  v);
 ATOMIC_ASM(clear,    char,  "andb %b1,%0", "iq", ~v);