On Tue, Apr 21, 2020 at 11:31:14AM +0800, Baoquan He wrote:

On 04/12/20 at 10:48pm, Mike Rapoport wrote:

quoted

From: Mike Rapoport <redacted>

The early_pfn_to_nid() and it's helper __early_pfn_to_nid() are spread
around include/linux/mm.h, include/linux/mmzone.h and mm/page_alloc.c.

Drop unused stub for __early_pfn_to_nid() and move its actual generic
implementation close to its users.

Signed-off-by: Mike Rapoport <redacted>
---
 include/linux/mm.h     |  4 ++--
 include/linux/mmzone.h |  9 --------
 mm/page_alloc.c        | 51 +++++++++++++++++++++---------------------
 3 files changed, 27 insertions(+), 37 deletions(-)

 
...

quoted

 int __meminit early_pfn_to_nid(unsigned long pfn)
 {
 	static DEFINE_SPINLOCK(early_pfn_lock);

@@ -6298,32 +6323,6 @@ void __meminit init_currently_empty_zone(struct zone *zone,
 	zone->initialized = 1;
 }
 
-#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP

Here it's apparently removing CONFIG_HAVE_MEMBLOCK_NODE_MAP too early,
it should be done in patch 3, and its #end is kept there. I just found
it when I almost became dizzy in reviewing patch 3.

Right, thanks for catching!

quoted

-#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
-

-- 
Sincerely yours,
Mike.