summaryrefslogtreecommitdiff
path: root/arch/sparc/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-02 20:23:34 -0700
committerDavid S. Miller <davem@davemloft.net>2011-08-02 21:28:53 -0700
commit56d205cc5c0a3032a605121d4253e111193bf923 (patch)
tree1e37a74fd6df18ec35a9d6a1f70eca2e649e4afb /arch/sparc/include
parentea5e7447ea9d555558e0f13798f5143dd51a915a (diff)
downloadlinux-3.10-56d205cc5c0a3032a605121d4253e111193bf923.tar.gz
linux-3.10-56d205cc5c0a3032a605121d4253e111193bf923.tar.bz2
linux-3.10-56d205cc5c0a3032a605121d4253e111193bf923.zip
sparc: Use popc when possible for ffs/__ffs/ffz.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r--arch/sparc/include/asm/bitops_64.h7
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 3588807baa6..29011cc0e4b 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