diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-02 20:23:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:41 -0700 |
| commit | 27ff2c083e9b0e719983eebda886775a5cea5cdd (patch) | |
| tree | 791035b5323a0da18f70a30ec3e02569b4eb4b30 /arch/sparc/include/asm/bitops_64.h | |
| parent | e6aefcf11c97220fecacddbad36335461b486ec9 (diff) | |
sparc: Use popc when possible for ffs/__ffs/ffz.
[ Upstream commit 56d205cc5c0a3032a605121d4253e111193bf923 ]
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/sparc/include/asm/bitops_64.h')
| -rw-r--r-- | arch/sparc/include/asm/bitops_64.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/bitops_64.h b/arch/sparc/include/asm/bitops_64.h index cfe052322ba..3fc595ad618 100644 --- a/arch/sparc/include/asm/bitops_64.h +++ b/arch/sparc/include/asm/bitops_64.h @@ -26,16 +26,17 @@ extern void change_bit(unsigned long nr, volatile unsigned long *addr); #define smp_mb__before_clear_bit() barrier() #define smp_mb__after_clear_bit() barrier() -#include <asm-generic/bitops/ffz.h> -#include <asm-generic/bitops/__ffs.h> #include <asm-generic/bitops/fls.h> #include <asm-generic/bitops/__fls.h> #include <asm-generic/bitops/fls64.h> #ifdef __KERNEL__ +extern int ffs(int x); +extern unsigned long __ffs(unsigned long); + +#include <asm-generic/bitops/ffz.h> #include <asm-generic/bitops/sched.h> -#include <asm-generic/bitops/ffs.h> /* * hweightN: returns the hamming weight (i.e. the number |