diff options
| author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:26 -0700 |
|---|---|---|
| committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:26 -0700 |
| commit | ee95f4059a833839bf52972191b2d4c3d3cec552 (patch) | |
| tree | a1c8587d9b82e64a75dde376a90a3d69b0f4847a /mm/page_alloc.c | |
| parent | d121f07691415df824e6b60520f782f6d13b3c81 (diff) | |
| parent | f81e1d35a6e36d30888c46283b8dd1022e847124 (diff) | |
Merge branch 'for-4.16/nfit' into libnvdimm-for-next
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1748dd4a4b1b..2bb7f163baca 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6260,6 +6260,8 @@ void __paginginit zero_resv_unavail(void) pgcnt = 0; for_each_resv_unavail_range(i, &start, &end) { for (pfn = PFN_DOWN(start); pfn < PFN_UP(end); pfn++) { + if (!pfn_valid(ALIGN_DOWN(pfn, pageblock_nr_pages))) + continue; mm_zero_struct_page(pfn_to_page(pfn)); pgcnt++; } |