summaryrefslogtreecommitdiff
path: root/arch/riscv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-07-26 09:50:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-07-26 09:50:36 -0700
commit51c4767503d5d3a5a0ae4dcb19b7f7cf38b40c6c (patch)
tree9fb9633115af3448c21496c176c6107e11a753c9 /arch/riscv
parent1722389b0d863056d78287a120a1d6cadb8d4f7b (diff)
parentfb9086e95ad84f14e4f4db97ed96422c74407830 (diff)
Merge tag 'bitmap-6.11-rc1' of https://github.com:/norov/linux
Pull bitmap updates from Yury Norov: "Random fixes" * tag 'bitmap-6.11-rc1' of https://github.com:/norov/linux: riscv: Remove unnecessary int cast in variable_fls() radix tree test suite: put definition of bitmap_clear() into lib/bitmap.c bitops: Add a comment explaining the double underscore macros lib: bitmap: add missing MODULE_DESCRIPTION() macros cpumask: introduce assign_cpu() macro
Diffstat (limited to 'arch/riscv')
-rw-r--r--arch/riscv/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/bitops.h b/arch/riscv/include/asm/bitops.h
index 880606b0469a..71af9ecfcfcb 100644
--- a/arch/riscv/include/asm/bitops.h
+++ b/arch/riscv/include/asm/bitops.h
@@ -170,7 +170,7 @@ legacy:
({ \
typeof(x) x_ = (x); \
__builtin_constant_p(x_) ? \
- (int)((x_ != 0) ? (32 - __builtin_clz(x_)) : 0) \
+ ((x_ != 0) ? (32 - __builtin_clz(x_)) : 0) \
: \
variable_fls(x_); \
})