From: Wei Yang <richard.weiyang@gmail.com>
Date: Thu, 8 Aug 2024 00:14:15 +0000 (+0000)
Subject: s390/mm: get estimated free pages by memblock api
X-Git-Tag: v6.12-rc1~50^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb088e38aab4c7e9ce711c18c66e851c8f4227bb;p=thirdparty%2Fkernel%2Flinux.git

s390/mm: get estimated free pages by memblock api

Instead of getting estimated free pages from memblock directly, we have
introduced an API, memblock_estimated_nr_free_pages(), which is more
friendly for users.

Just replace it with new API, no functional change.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
CC: Mike Rapoport <rppt@kernel.org>
CC: David Hildenbrand <david@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/20240808001415.6298-3-richard.weiyang@gmail.com
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index e3d258f9e7261..651344206294d 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -62,7 +62,7 @@ EXPORT_SYMBOL(zero_page_mask);
 
 static void __init setup_zero_pages(void)
 {
-	unsigned long total_pages = PHYS_PFN(memblock_phys_mem_size() - memblock_reserved_size());
+	unsigned long total_pages = memblock_estimated_nr_free_pages();
 	unsigned int order;
 	struct page *page;
 	int i;