X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=lib%2Fffz.h;h=16c9ae9ebea8adaefbf11d6c51de26be71a9473b;hb=47714d68b54de5f9520f8bef520d1451d8eddc04;hp=4324f5a3c67b378b93bda2201c937164f5d43477;hpb=6839616ff2ac013c8b0fbeb2a97f6cf20976b9f3;p=fio.git

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