diff options
| author | Dan Williams | 2018-12-28 04:54:10 +0100 |
|---|---|---|
| committer | Dan Williams | 2018-12-28 04:54:10 +0100 |
| commit | 4b5f747e82b12b6d8ab815fc259827a615c7f2c3 (patch) | |
| tree | ec5eb3857bbb776ac521f555978fcb78cc6bd2a8 /mm/shmem.c | |
| parent | libnvdimm/security: Quiet security operations (diff) | |
| parent | libnvdimm, namespace: Replace kmemdup() with kstrndup() (diff) | |
| download | kernel-qcow2-linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.tar.gz kernel-qcow2-linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.tar.xz kernel-qcow2-linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.zip | |
Merge miscellaneous libnvdimm updates for 4.21
* Use common helpers, bitmap_zalloc() and kstrndup(), to replace open
coded versions.
* Clarify the comments around hotplug vs initial init case for the nfit
driver.
* Cleanup the libnvdimm init path.
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index cddc72ac44d8..921f80488bb3 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1439,7 +1439,7 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, shmem_pseudo_vma_init(&pvma, info, hindex); page = alloc_pages_vma(gfp | __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN, - HPAGE_PMD_ORDER, &pvma, 0, numa_node_id()); + HPAGE_PMD_ORDER, &pvma, 0, numa_node_id(), true); shmem_pseudo_vma_destroy(&pvma); if (page) prep_transhuge_page(page); |