diff options
| author | fire855 <thefire855@gmail.com> | 2018-03-06 22:47:10 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-11-30 14:44:18 +0100 |
| commit | 2e7045e4e568b4ef4d8e6751409f402a08d09528 (patch) | |
| tree | f9d62f583c594eb9e75a96b91f5db55265740cfe /mm/memory.c | |
| parent | 55bb226d3043c010e0c1d6e95e09c634053f9248 (diff) | |
mm: add CMA page allocation
needed for new ion driver
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/memory.c b/mm/memory.c index a59ca8b28..12d825704 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2823,11 +2823,7 @@ gotten: if (!new_page) goto oom; } else { -#if !defined(CONFIG_CMA) || !defined(CONFIG_MTK_SVP) - new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address); -#else - new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_NOZONECMA, vma, address); -#endif + new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE | __GFP_CMA, vma, address); if (!new_page) goto oom; cow_user_page(new_page, old_page, address, vma); |