Fio 2.1.10

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index 2f2d06981bdb0cbbdba24e52771551b2ed8a9fbc..b8eee66a14501fd2d083dda2920684940b7cb815 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -200,6 +200,7 @@ static inline uint64_t fio_swap64(uint64_t val)
 #endif
 #endif /* FIO_HAVE_BYTEORDER_FUNCS */
 
+#ifdef FIO_INTERNAL
 #define le16_to_cpu(val) ({                    \
        __le16_to_cpu(val);                     \
 })
@@ -209,6 +210,8 @@ static inline uint64_t fio_swap64(uint64_t val)
 #define le64_to_cpu(val) ({                    \
        __le64_to_cpu(val);                             \
 })
+#endif
+
 #define cpu_to_le16(val) ({                    \
        __cpu_to_le16(val);                     \
 })
@@ -321,7 +324,7 @@ static inline unsigned int cpus_online(void)
 }
 #endif
 
-#ifndef CONFIG_CPU_COUNT
+#ifndef CPU_COUNT
 #ifdef FIO_HAVE_CPU_AFFINITY
 static inline int CPU_COUNT(os_cpu_mask_t *mask)
 {