patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-x86_64 / bitops.h

diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h
index 5ce5dce..c91f028 100644 (file)
--- a/include/asm-x86_64/bitops.h
+++ b/include/asm-x86_64/bitops.h
@@ -337,16 +337,15 @@ static __inline__ int find_first_bit(const unsigned long * addr, unsigned size)
                "repe; scasl\n\t"
                "jz 1f\n\t"
                "leaq -4(%%rdi),%%rdi\n\t"
-               "bsfq (%%rdi),%%rax\n"
-               "1:\tsubl %%ebx,%%edi\n\t"
+               "bsfl (%%rdi),%%eax\n"
+               "1:\tsubq %%rbx,%%rdi\n\t"
                "shll $3,%%edi\n\t"
                "addl %%edi,%%eax"
                :"=a" (res), "=&c" (d0), "=&D" (d1)
-               :"1" ((size + 31) >> 5), "2" (addr), "b" (addr));
+               :"1" ((size + 31) >> 5), "2" (addr), "b" (addr) : "memory");
        return res;
 }
 
-
 /**
  * find_next_bit - find the first set bit in a memory region
  * @addr: The address to base the search on
@@ -458,7 +457,7 @@ static __inline__ int ffs(int x)
 
        __asm__("bsfl %1,%0\n\t"
                "cmovzl %2,%0" 
-               : "=r" (r) : "g" (x), "r" (-1));
+               : "=r" (r) : "rm" (x), "r" (-1));
        return r+1;
 }