aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>2022-05-27 13:53:44 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2022-07-06 14:07:04 +0200
commit6f08e51cdbe08370ad0a8580d0d6ea6ffdfed46d (patch)
tree55399971f7e46905db9ccff767959e3b715d3cd0 /arch/m68k
parentm68k: Kconfig.machine: Add endif comment (diff)
downloadlinux-dev-6f08e51cdbe08370ad0a8580d0d6ea6ffdfed46d.tar.xz
linux-dev-6f08e51cdbe08370ad0a8580d0d6ea6ffdfed46d.zip
m68k: bitops: Change __fls to return and accept unsigned long
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> Link: https://lore.kernel.org/r/20220527115345.2588775-3-amadeuszx.slawinski@linux.intel.com Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
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;
}