From: Kirill A. Shutemov <kirill@shutemov.name>
Date: Wed, 15 Mar 2023 15:38:00 +0000 (+0300)
Subject: mm-treewide-redefine-max_order-sanely-fix.txt
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8ebd127c6b80062de4f6589190bbc871b6a164c5;p=users%2Fjedix%2Flinux-maple.git

mm-treewide-redefine-max_order-sanely-fix.txt

fix min() warning

Link: https://lkml.kernel.org/r/20230315153800.32wib3n5rickolvh@box
Reported-by: kernel test robot <lkp@intel.com>
  Link: https://lore.kernel.org/oe-kbuild-all/202303152343.D93IbJmn-lkp@intel.com/
Signed-off-by: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/memblock.c b/mm/memblock.c
index 338b8cb0793e6..7911224b1ed39 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -2043,7 +2043,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
 	int order;
 
 	while (start < end) {
-		order = min(MAX_ORDER, __ffs(start));
+		order = min_t(int, MAX_ORDER, __ffs(start));
 
 		while (start + (1UL << order) > end)
 			order--;