From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 15 Mar 2023 20:54:45 +0000 (-0700)
Subject: mm-treewide-redefine-max_order-sanely-fix-2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5d6a0cb0cf4a78a1c7546c11ca0a3b7130c3a079;p=users%2Fjedix%2Flinux-maple.git

mm-treewide-redefine-max_order-sanely-fix-2

fix another min_t warning

Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: kernel test robot <lkp@intel.com>
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/memory_hotplug.c b/mm/memory_hotplug.c
index 86291c79a764..c8f0a8c2d049 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -605,7 +605,7 @@ static void online_pages_range(unsigned long start_pfn, unsigned long nr_pages)
 	 * this and the first chunk to online will be pageblock_nr_pages.
 	 */
 	for (pfn = start_pfn; pfn < end_pfn;) {
-		int order = min(MAX_ORDER, __ffs(pfn));
+		int order = min_t(int, MAX_ORDER, __ffs(pfn));
 
 		(*online_page_callback)(pfn_to_page(pfn), order);
 		pfn += (1UL << order);