Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a94b3ab7eab4edcc9b2cb474b188f774c331adf7

Authored by Mike Kravetz
Committed by Linus Torvalds
1 parent d5afa6dcf7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Mike Kravetz <kravetz@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 0 additions and 8 deletions Side-by-side Diff

include/linux/mmzone.h
Diff comments   View file @ a94b3ab
... ... @@ -603,12 +603,6 @@
603 603 #define sparse_index_init(_sec, _nid) do {} while (0)
604 604 #endif /* CONFIG_SPARSEMEM */
605 605  
606   -#ifdef CONFIG_NODES_SPAN_OTHER_NODES
607   -#define early_pfn_in_nid(pfn, nid) (early_pfn_to_nid(pfn) == (nid))
608   -#else
609   -#define early_pfn_in_nid(pfn, nid) (1)
610   -#endif
611   -
612 606 #ifndef early_pfn_valid
613 607 #define early_pfn_valid(pfn) (1)
614 608 #endif
... ... @@ -1708,8 +1708,6 @@
1708 1708 for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) {
1709 1709 if (!early_pfn_valid(pfn))
1710 1710 continue;
1711   - if (!early_pfn_in_nid(pfn, nid))
1712   - continue;
1713 1711 page = pfn_to_page(pfn);
1714 1712 set_page_links(page, zone, nid, pfn);
1715 1713 set_page_count(page, 1);