summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-12-04 01:04:52 +0100
committerDavid S. Miller <davem@davemloft.net>2008-12-04 01:04:52 +0100
commite8e8e80ee047b131a0cd6a3e96e0f8dfa14f6d99 (patch)
tree6c883fece4df6f24c6735813e0189b93744f4da1
parentsparc64: Fix bug in PTRACE_SETFPREGS64 handling. (diff)
downloadlinux-e8e8e80ee047b131a0cd6a3e96e0f8dfa14f6d99.tar.xz
linux-e8e8e80ee047b131a0cd6a3e96e0f8dfa14f6d99.zip
sparc: asm/bitops.h should define __fls
bitops_64.h includes the generic one; pretty sure 32 should too. (Found by using __fls in generic code and breaking sparc defconfig build: thanks Stephen and linux-next!) Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/include/asm/bitops_32.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h
index 68b98a7e6454..9cf4ae0cd7ba 100644
--- a/arch/sparc/include/asm/bitops_32.h
+++ b/arch/sparc/include/asm/bitops_32.h
@@ -98,6 +98,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
#include <asm-generic/bitops/sched.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>
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/lock.h>