diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-06 16:13:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-06 16:13:35 +1100 |
| commit | 97686b752e9b2cf7c56f7068727c800895125087 (patch) | |
| tree | 1bebf26554e8c0e7dc779e9ef7e066e168dac9ad /mm/page_ext.c | |
| parent | b888129b0ae73e92f128fcf76e407bea8c49a872 (diff) | |
| parent | 3133efe899e743a5ef0e315d4713fd04e439c815 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'mm/page_ext.c')
| -rw-r--r-- | mm/page_ext.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/page_ext.c b/mm/page_ext.c index ae44f7adbe07..762d5b7eb523 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -300,7 +300,7 @@ static int __meminit online_page_ext(unsigned long start_pfn, start = SECTION_ALIGN_DOWN(start_pfn); end = SECTION_ALIGN_UP(start_pfn + nr_pages); - if (nid == -1) { + if (nid == NUMA_NO_NODE) { /* * In this case, "nid" already exists and contains valid memory. * "start_pfn" passed to us is a pfn which is an arg for @@ -398,10 +398,8 @@ void __init page_ext_init(void) * We know some arch can have a nodes layout such as * -------------pfn--------------> * N0 | N1 | N2 | N0 | N1 | N2|.... - * - * Take into account DEFERRED_STRUCT_PAGE_INIT. */ - if (early_pfn_to_nid(pfn) != nid) + if (pfn_to_nid(pfn) != nid) continue; if (init_section_page_ext(pfn, nid)) goto oom; |