$NetBSD$

--- lib/include/vm_atomic.h.orig	2008-08-08 02:01:52.000000000 -0500
+++ lib/include/vm_atomic.h
@@ -22,8 +22,8 @@
  *	Atomic power
  */
 
-#ifndef _ATOMIC_H_
-#define _ATOMIC_H_
+#ifndef _VM_ATOMIC_H_
+#define _VM_ATOMIC_H_
 
 #define INCLUDE_ALLOW_USERLEVEL
 #define INCLUDE_ALLOW_VMMEXT
@@ -154,7 +154,8 @@ Atomic_VolatileToAtomic(volatile uint32 
      __GNUC__ >= 3 &&                                                   \
     !defined(BSD_VERSION) &&                                            \
     (!defined(MODULE) || defined(__VMKERNEL_MODULE__)) &&               \
-    !defined(__APPLE__) /* PR136775 */
+    !defined(__APPLE__) /* PR136775 */ ||				\
+    !defined(__NetBSD__)
 #define ATOMIC_USE_FENCE
 #endif
 
@@ -2046,4 +2047,4 @@ Atomic_MFence(void)
    Atomic_Xor(&fence, 0x1);
 }
 
-#endif // ifndef _ATOMIC_H_
+#endif // ifndef _VM_ATOMIC_H_