diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2019-03-11 15:37:55 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2019-03-11 15:37:55 -0400 |
| commit | 4083014e32699af04a8e6eaa4855b08dba36a47a (patch) | |
| tree | fa37f9f9691fe64ca8a3c0cdc0315dc12462e6e4 /mm/page_alloc.c | |
| parent | 6fd96ff557963de8e62842a0dc360a6e3610d2bb (diff) | |
| parent | 78153dd45e7e0596ba32b15d02bda08e1513111e (diff) | |
Merge branch 'for-5.1/nfit/ars' into libnvdimm-for-next
Merge several updates to the ARS implementation. Highlights include:
* Support retrieval of short-ARS results if the ARS state is "requires
continuation", and even if the "no_init_ars" module parameter is
specified.
* Allow busy-polling of the kernel ARS state by allowing root to reset
the exponential back-off timer.
* Filter potentially stale ARS results by tracking query-ARS relative to
the previous start-ARS.
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d295c9bc01a8..35fdde041f5c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -5701,18 +5701,6 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, | |||
| 5701 | cond_resched(); | 5701 | cond_resched(); |
| 5702 | } | 5702 | } |
| 5703 | } | 5703 | } |
| 5704 | #ifdef CONFIG_SPARSEMEM | ||
| 5705 | /* | ||
| 5706 | * If the zone does not span the rest of the section then | ||
| 5707 | * we should at least initialize those pages. Otherwise we | ||
| 5708 | * could blow up on a poisoned page in some paths which depend | ||
| 5709 | * on full sections being initialized (e.g. memory hotplug). | ||
| 5710 | */ | ||
| 5711 | while (end_pfn % PAGES_PER_SECTION) { | ||
| 5712 | __init_single_page(pfn_to_page(end_pfn), end_pfn, zone, nid); | ||
| 5713 | end_pfn++; | ||
| 5714 | } | ||
| 5715 | #endif | ||
| 5716 | } | 5704 | } |
| 5717 | 5705 | ||
| 5718 | #ifdef CONFIG_ZONE_DEVICE | 5706 | #ifdef CONFIG_ZONE_DEVICE |
