Re: [PATCH v2 3/3] sparc64: bitops: Change __fls to return unsigned long

From: Amadeusz Sławiński
Date: Wed Aug 03 2022 - 04:48:13 EST


On 5/27/2022 1:53 PM, Amadeusz Sławiński wrote:
As per asm-generic definition and other architectures __fls should
return unsigned long.

No functional change is expected as return value should fit in unsigned
long.

Reviewed-by: Cezary Rojewski <cezary.rojewski@xxxxxxxxx>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx>
---
arch/sparc/include/asm/bitops_64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sparc/include/asm/bitops_64.h b/arch/sparc/include/asm/bitops_64.h
index 005a8ae858f1..cdac39bd7b32 100644
--- a/arch/sparc/include/asm/bitops_64.h
+++ b/arch/sparc/include/asm/bitops_64.h
@@ -24,7 +24,7 @@ void clear_bit(unsigned long nr, volatile unsigned long *addr);
void change_bit(unsigned long nr, volatile unsigned long *addr);
int fls(unsigned int word);
-int __fls(unsigned long word);
+unsigned long __fls(unsigned long word);
#include <asm-generic/bitops/non-atomic.h>

Hi,

any chance this one could also get merged? Other two patches are already in linux-next and I would like to remove it from list of things I have to remember ;)

Amadeusz