X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fffz.h;h=16c9ae9ebea8adaefbf11d6c51de26be71a9473b;hb=2226ce346557b79b85de46e5bb47b9102f709180;hp=eef612d1a136106feacc4d65939da21f3fcefa26;hpb=0ce8b119b65849e537cab628a176a0ec4238aab0;p=fio.git

diff --git a/lib/ffz.h b/lib/ffz.h
index eef612d1..16c9ae9e 100644
--- a/lib/ffz.h
+++ b/lib/ffz.h
@@ -1,16 +1,16 @@
 #ifndef FIO_FFZ_H
 #define FIO_FFZ_H
 
-static inline int __ffs(unsigned long word)
+#include <inttypes.h>
+
+static inline int ffs64(uint64_t word)
 {
 	int r = 0;
 
-#if BITS_PER_LONG == 64
 	if ((word & 0xffffffff) == 0) {
 		r += 32;
 		word >>= 32;
 	}
-#endif
 	if (!(word & 0xffff)) {
 		word >>= 16;
 		r += 16;
@@ -27,17 +27,26 @@ static inline int __ffs(unsigned long word)
 		word >>= 2;
 		r += 2;
 	}
-	if (!(word & 1)) {
-		word >>= 1;
+	if (!(word & 1))
 		r += 1;
-	}
 
 	return r;
 }
 
+#ifndef ARCH_HAVE_FFZ
+
 static inline int ffz(unsigned long bitmask)
 {
-	return __ffs(~bitmask);
+	return ffs64(~bitmask);
+}
+
+#else
+#define ffz(bitmask)	arch_ffz(bitmask)
+#endif
+
+static inline int ffz64(uint64_t bitmask)
+{
+	return ffs64(~bitmask);
 }
 
 #endif