From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> commit f6e9d38f8eb00ac8b52e6d15f6aa9bcecacb081b upstream. BUILD_BUG_ON*() macros are defined in build_bug.h. Include it. Replace compiler_types.h by compiler.h, which provides the former, to have a definition of the __UNIQUE_ID(). Link: https://lkml.kernel.org/r/20230912092355.79280-1-andriy.shevchenko@xxxxxxxxxxxxxxx Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Reviewed-by: Herve Codina <herve.codina@xxxxxxxxxxx> Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> (cherry picked from commit f6e9d38f8eb00ac8b52e6d15f6aa9bcecacb081b) Signed-off-by: SeongJae Park <sj@xxxxxxxxxx> [Fix a conflict due to absence of compiler_types.h include] Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/linux/minmax.h | 2 ++ 1 file changed, 2 insertions(+) --- a/include/linux/minmax.h +++ b/include/linux/minmax.h @@ -2,6 +2,8 @@ #ifndef _LINUX_MINMAX_H #define _LINUX_MINMAX_H +#include <linux/build_bug.h> +#include <linux/compiler.h> #include <linux/const.h> /* Patches currently in stable-queue which might be from sj@xxxxxxxxxx are queue-5.15/minmax-allow-min-max-clamp-if-the-arguments-have-the-same-signedness.patch queue-5.15/minmax-sanity-check-constant-bounds-when-clamping.patch queue-5.15/minmax-clamp-more-efficiently-by-avoiding-extra-comparison.patch queue-5.15/minmax-relax-check-to-allow-comparison-between-unsigned-arguments-and-signed-constants.patch queue-5.15/minmax-fix-header-inclusions.patch queue-5.15/mm-damon-core-merge-regions-aggressively-when-max_nr_regions-is-unmet.patch queue-5.15/tracing-define-the-is_signed_type-macro-once.patch queue-5.15/minmax-allow-comparisons-of-int-against-unsigned-char-short.patch
