summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-03-08 10:20:35 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-03-21 12:23:02 +0100
commitced9a7171e0904b788f4546456431f886753726c (patch)
tree675fe086fd4f09fb58c46f9e0fa00eb899626116 /arch/arm/include
parentbc19930ea76b4b1a1f7a69fffb36899be04923fb (diff)
downloadbarebox-ced9a7171e0904b788f4546456431f886753726c.tar.gz
barebox-ced9a7171e0904b788f4546456431f886753726c.tar.xz
ARM: aarch64: Do not use 32bit optimized fls
The clz operation only works with 32bit values, so use the generic fls() variants on aarch64. With this tlsf_malloc works as expected. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index cd356c5e3d..348a76b2c1 100644
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -115,7 +115,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
#endif /* __ARMEB__ */
-#if defined(__LINUX_ARM_ARCH__) && (__LINUX_ARM_ARCH__ >= 5)
+#if defined (CONFIG_CPU_32) && defined(__LINUX_ARM_ARCH__) && (__LINUX_ARM_ARCH__ >= 5)
static inline int constant_fls(int x)
{
int r = 32;