diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-11 12:15:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-11 12:15:55 +0800 |
| commit | e01035c1a71d7cceebc3df92f79577df7438523a (patch) | |
| tree | f745442c513b343e0a5d8fc84c4c0eb6603ec7b2 /mm/page_alloc.c | |
| parent | da9a92f0cde9ce34a930d7edcaef30429e41d14a (diff) | |
| parent | 3d27bcb804a6889e8f16daf95751764907f1e100 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8bbefa93eb77..1874f2902237 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -287,7 +287,9 @@ static inline void reset_deferred_meminit(pg_data_t *pgdat) /* Returns true if the struct page for the pfn is uninitialised */ static inline bool __meminit early_page_uninitialised(unsigned long pfn) { - if (pfn >= NODE_DATA(early_pfn_to_nid(pfn))->first_deferred_pfn) + int nid = early_pfn_to_nid(pfn); + + if (node_online(nid) && pfn >= NODE_DATA(nid)->first_deferred_pfn) return true; return false; @@ -1069,7 +1071,7 @@ int __meminit early_pfn_to_nid(unsigned long pfn) spin_lock(&early_pfn_lock); nid = __early_pfn_to_nid(pfn, &early_pfnnid_cache); if (nid < 0) - nid = 0; + nid = first_online_node; spin_unlock(&early_pfn_lock); return nid; |