mm/memblock: use PAGE_ALIGN_DOWN to get pgend in free_memmap

Leverage the macro PAGE_ALIGN_DOWN to get pgend.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Link: https://lore.kernel.org/r/20240507075833.6346-7-richard.weiyang@gmail.com
Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>

diff --git a/mm/memblock.c b/mm/memblock.c
index da9a6c862a6911a3b23f2df3d5eb4124fa33240a..33a8b6f7b626b6b8485cfe638dde2b4df1d8dc73 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -2039,7 +2039,7 @@ static void __init free_memmap(unsigned long start_pfn, unsigned long end_pfn)
         * downwards.
         */
        pg = PAGE_ALIGN(__pa(start_pg));
-       pgend = __pa(end_pg) & PAGE_MASK;
+       pgend = PAGE_ALIGN_DOWN(__pa(end_pg));
 
        /*
         * If there are free pages between these, free the section of the

diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h
index dc0fc7125bc31ab983f158cc956985aedab99356..cad4f2927983f272a8daa788279563a35312c767 100644 (file)
--- a/tools/include/linux/mm.h
+++ b/tools/include/linux/mm.h
@@ -12,6 +12,7 @@
 #define PHYS_ADDR_MAX  (~(phys_addr_t)0)
 
 #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
+#define PAGE_ALIGN_DOWN(addr) ALIGN_DOWN(addr, PAGE_SIZE)
 
 #define __va(x) ((void *)((unsigned long)(x)))
 #define __pa(x) ((unsigned long)(x))