summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2016-04-25 03:06:37 +0200
committerMax Filippov <jcmvbkbc@gmail.com>2016-07-24 05:33:29 +0200
commit12c8007dafbb7a9719d7beb04b79c9406c265f47 (patch)
treea2798f27da3f149c1eae27c66c1572bcfeb7fedb /arch/xtensa/include
parentxtensa: define ___unlock_[di]cache_all unconditionally (diff)
downloadlinux-12c8007dafbb7a9719d7beb04b79c9406c265f47.tar.xz
linux-12c8007dafbb7a9719d7beb04b79c9406c265f47.zip
xtensa: fix __ffs result type
Make __ffs result type unsigned long to match generic asm implementation. This fixes the following build warning: mm/nobootmem.c: In function '__free_pages_memory': include/linux/kernel.h:742:17: warning: comparison of distinct pointer types lacks a cast (void) (&_min1 == &_min2); \ ^ mm/nobootmem.c:100:11: note: in expansion of macro 'min' order = min(MAX_ORDER - 1UL, __ffs(start)); Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/include')
-rw-r--r--arch/xtensa/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h
index 3f44fa2a53e9..d3490189792b 100644
--- a/arch/xtensa/include/asm/bitops.h
+++ b/arch/xtensa/include/asm/bitops.h
@@ -48,7 +48,7 @@ static inline int ffz(unsigned long x)
* __ffs: Find first bit set in word. Return 0 for bit 0
*/
-static inline int __ffs(unsigned long x)
+static inline unsigned long __ffs(unsigned long x)
{
return 31 - __cntlz(x & -x);
}