summaryrefslogtreecommitdiffstats
path: root/arch/hexagon
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@infradead.org>2019-01-04 00:26:41 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-04 22:13:46 +0100
commit3fc2579e6f162fcff964f5aa01c8a29438ca5c05 (patch)
treea90c733a19c07e111d9195181d1f3a37e92ef0eb /arch/hexagon
parentinclude/linux/printk.h: drop silly "static inline asmlinkage" from dump_stack() (diff)
downloadlinux-3fc2579e6f162fcff964f5aa01c8a29438ca5c05.tar.xz
linux-3fc2579e6f162fcff964f5aa01c8a29438ca5c05.zip
fls: change parameter to unsigned int
When testing in userspace, UBSAN pointed out that shifting into the sign bit is undefined behaviour. It doesn't really make sense to ask for the highest set bit of a negative value, so just turn the argument type into an unsigned int. Some architectures (eg ppc) already had it declared as an unsigned int, so I don't expect too many problems. Link: http://lkml.kernel.org/r/20181105221117.31828-1-willy@infradead.org Signed-off-by: Matthew Wilcox <willy@infradead.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/hexagon')
-rw-r--r--arch/hexagon/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/hexagon/include/asm/bitops.h b/arch/hexagon/include/asm/bitops.h
index 2691a1857d20..bee974262387 100644
--- a/arch/hexagon/include/asm/bitops.h
+++ b/arch/hexagon/include/asm/bitops.h
@@ -211,7 +211,7 @@ static inline long ffz(int x)
* This is defined the same way as ffs.
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
*/
-static inline int fls(int x)
+static inline int fls(unsigned int x)
{
int r;