6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wei Yang <richard.weiyang@xxxxxxxxx> [ Upstream commit 7d8ed162e6a92268d4b2b84d364a931216102c8e ] commit 6a9531c3a880 ("memblock: fix crash when reserved memory is not added to memory") introduce the usage of early_pfn_to_nid, which is not defined in memblock tests. The original definition of early_pfn_to_nid is defined in mm.h, so let add this in the corresponding mm.h. Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx> CC: Yajun Deng <yajun.deng@xxxxxxxxx> CC: Mike Rapoport <rppt@xxxxxxxxxx> Link: https://lore.kernel.org/r/20240402132701.29744-2-richard.weiyang@xxxxxxxxx Signed-off-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- tools/include/linux/mm.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h index 43be27bcc897d..2f401e8c6c0bb 100644 --- a/tools/include/linux/mm.h +++ b/tools/include/linux/mm.h @@ -37,4 +37,9 @@ static inline void totalram_pages_add(long count) { } +static inline int early_pfn_to_nid(unsigned long pfn) +{ + return 0; +} + #endif -- 2.43.0