Skip to content

Commit a5743f3

Browse files
david-laightakpm00
authored andcommitted
minmax.h: use BUILD_BUG_ON_MSG() for the lo < hi test in clamp()
Use BUILD_BUG_ON_MSG(statically_true(ulo > uhi), ...) for the sanity check of the bounds in clamp(). Gives better error coverage and one less expansion of the arguments. Link: https://lkml.kernel.org/r/34d53778977747f19cce2abb287bb3e6@AcuMS.aculab.com Signed-off-by: David Laight <david.laight@aculab.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Arnd Bergmann <arnd@kernel.org> Cc: Christoph Hellwig <hch@infradead.org> Cc: Dan Carpenter <dan.carpenter@linaro.org> Cc: Jason A. Donenfeld <Jason@zx2c4.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Mateusz Guzik <mjguzik@gmail.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Pedro Falcato <pedro.falcato@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent b280bb2 commit a5743f3

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

include/linux/minmax.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106
__auto_type uval = (val); \
107107
__auto_type ulo = (lo); \
108108
__auto_type uhi = (hi); \
109-
static_assert(__builtin_choose_expr(__is_constexpr((lo) > (hi)), \
110-
(lo) <= (hi), true), \
109+
BUILD_BUG_ON_MSG(statically_true(ulo > uhi), \
111110
"clamp() low limit " #lo " greater than high limit " #hi); \
112111
BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi), \
113112
"clamp("#val", "#lo", "#hi") signedness error"); \

0 commit comments

Comments
 (0)