Merge branch 'asmfix' of https://github.com/oohal/fio

[fio.git] / os / os-netbsd.h

diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index eac76cf26bb2ea9247ecaf394468b4987e831585..682a11c95f1ccb91df421e424923dbd2c9703761 100644 (file)
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -11,9 +11,9 @@
 #include <sys/dkio.h>
 #include <sys/disklabel.h>
 #include <sys/endian.h>
-/* XXX hack to avoid confilcts between rbtree.h and <sys/rb.h> */
-#define        rb_node _rb_node
 #include <sys/sysctl.h>
+
+/* XXX hack to avoid confilcts between rbtree.h and <sys/rbtree.h> */
 #undef rb_node
 #undef rb_left
 #undef rb_right
@@ -26,8 +26,6 @@
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID
 
-#undef FIO_HAVE_CPU_AFFINITY   /* doesn't exist */
-
 #define OS_MAP_ANON            MAP_ANON
 
 #ifndef PTHREAD_STACK_MIN