Index: sys/sys/systm.h
===================================================================
--- sys/sys/systm.h	(revision 196271)
+++ sys/sys/systm.h	(working copy)
@@ -91,7 +91,7 @@
 
 #define	ASSERT_ATOMIC_LOAD(var,msg)					\
 	KASSERT(sizeof(var) <= sizeof(uintptr_t) &&			\
-	    ALIGN(&(var)) == (uintptr_t)&(var), msg)
+	    ((uintptr_t)&(var) & (sizeof(uintptr_t) - 1)) == 0, msg)
 
 /*
  * XXX the hints declarations are even more misplaced than most declarations