arch-ppc.h: Add ilog2 implementation for ppc64

[fio.git] / arch / arch-ppc.h

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index d4a080c4e91f31050404cab8c61b6d23bbe7f371..aed41f9bad6d53d6ee06978f95e8e1d131ce4a8a 100644 (file)
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -33,18 +33,24 @@
 
 #define write_barrier()        __asm__ __volatile__ ("sync" : : : "memory")
 
+#ifdef __powerpc64__
+#define PPC_CNTLZL "cntlzd"
+#else
+#define PPC_CNTLZL "cntlzw"
+#endif
+
 static inline int __ilog2(unsigned long bitmask)
 {
        int lz;
 
-       asm ("cntlzw %0,%1" : "=r" (lz) : "r" (bitmask));
-       return 31 - lz;
+       asm (PPC_CNTLZL " %0,%1" : "=r" (lz) : "r" (bitmask));
+       return BITS_PER_LONG - 1 - lz;
 }
 
 static inline int arch_ffz(unsigned long bitmask)
 {
        if ((bitmask = ~bitmask) == 0)
-               return 32;
+               return BITS_PER_LONG;
        return  __ilog2(bitmask & -bitmask);
 }