From: David Laight <david.lai...@aculab.com> [ Upstream commit a5743f32baec4728711bbc01d6ac2b33d4c67040 ]
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/34d53778977747f19cce2abb287bb...@acums.aculab.com Signed-off-by: David Laight <david.lai...@aculab.com> Cc: Andy Shevchenko <andriy.shevche...@linux.intel.com> Cc: Arnd Bergmann <a...@kernel.org> Cc: Christoph Hellwig <h...@infradead.org> Cc: Dan Carpenter <dan.carpen...@linaro.org> Cc: Jason A. Donenfeld <ja...@zx2c4.com> Cc: Jens Axboe <ax...@kernel.dk> Cc: Lorenzo Stoakes <lorenzo.stoa...@oracle.com> Cc: Mateusz Guzik <mjgu...@gmail.com> Cc: Matthew Wilcox <wi...@infradead.org> Cc: Pedro Falcato <pedro.falc...@gmail.com> Signed-off-by: Andrew Morton <a...@linux-foundation.org> Signed-off-by: Eliav Farber <farb...@amazon.com> --- include/linux/minmax.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/minmax.h b/include/linux/minmax.h index 6f7ea669d305..91aa1b90c1bb 100644 --- a/include/linux/minmax.h +++ b/include/linux/minmax.h @@ -106,8 +106,7 @@ __auto_type uval = (val); \ __auto_type ulo = (lo); \ __auto_type uhi = (hi); \ - static_assert(__builtin_choose_expr(__is_constexpr((lo) > (hi)), \ - (lo) <= (hi), true), \ + BUILD_BUG_ON_MSG(statically_true(ulo > uhi), \ "clamp() low limit " #lo " greater than high limit " #hi); \ BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi), \ "clamp("#val", "#lo", "#hi") signedness error"); \ -- 2.47.3
