Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a94b3ab7 authored by Mike Kravetz's avatar Mike Kravetz Committed by Linus Torvalds
Browse files

[PATCH] mm: remove arch independent NODES_SPAN_OTHER_NODES 



The NODES_SPAN_OTHER_NODES config option was created so that DISCONTIGMEM
could handle pSeries numa layouts.  However, support for DISCONTIGMEM has
been replaced by SPARSEMEM on powerpc.  As a result, this config option and
supporting code is no longer needed.

I have already sent a patch to Paul that removes the option from powerpc
specific code.  This removes the arch independent piece.  Doesn't really
matter which is applied first.

Signed-off-by: default avatarMike Kravetz <kravetz@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d5afa6dc

include/linux/mmzone.h

+0 −6
Original line number Diff line number Diff line
@@ -603,12 +603,6 @@ void sparse_init(void); 
#define sparse_index_init(_sec, _nid)  do {} while (0)

#endif /* CONFIG_SPARSEMEM */



#ifdef CONFIG_NODES_SPAN_OTHER_NODES

#define early_pfn_in_nid(pfn, nid)	(early_pfn_to_nid(pfn) == (nid))

#else

#define early_pfn_in_nid(pfn, nid)	(1)

#endif



#ifndef early_pfn_valid

#define early_pfn_valid(pfn)	(1)

#endif

mm/page_alloc.c

+0 −2
Original line number Diff line number Diff line
@@ -1708,8 +1708,6 @@ void __devinit memmap_init_zone(unsigned long size, int nid, unsigned long zone, 
	for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) {

		if (!early_pfn_valid(pfn))

			continue;

		if (!early_pfn_in_nid(pfn, nid))

			continue;

		page = pfn_to_page(pfn);

		set_page_links(page, zone, nid, pfn);

		set_page_count(page, 1);