From: Stephen Rothwell Date: Thu, 10 May 2007 10:15:27 +0000 (-0700) Subject: early_pfn_to_nid needs to be __meminit X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f076f5dd9d227cea2704061048894b00cc0d62b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git early_pfn_to_nid needs to be __meminit Since it is referenced by memmap_init_zone (which is __meminit) via the early_pfn_in_nid macro when CONFIG_NODES_SPAN_OTHER_NODES is set (which basically means PowerPC 64). This removes a section mismatch warning in those circumstances. Signed-off-by: Stephen Rothwell Cc: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f9b5d6d5f4d6..ae96dd844432 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2284,7 +2284,7 @@ static int __meminit next_active_region_index_in_nid(int index, int nid) * was used and there are no special requirements, this is a convenient * alternative */ -int __init early_pfn_to_nid(unsigned long pfn) +int __meminit early_pfn_to_nid(unsigned long pfn) { int i;