Message ID | 20220527115345.2588775-3-amadeuszx.slawinski@linux.intel.com |
---|---|
State | New |
Headers | show |
Series | bitops: __fls adjustments | expand |
On Fri, May 27, 2022 at 1:53 PM Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> wrote: > As per asm-generic definition and other architectures __fls should > return and accept unsigned long as its parameter. > > No functional change is expected as return value should fit in unsigned > long. > > Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> > Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> i.e. will queue in the m68k for-v5.20 branch. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index 51283db53667..87c2cd66a9ce 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -510,7 +510,7 @@ static inline int fls(unsigned int x) return 32 - cnt; } -static inline int __fls(int x) +static inline unsigned long __fls(unsigned long x) { return fls(x) - 1; }