mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
mm: Use correct define for CMA features
CMA features may ifdef out parts of the code with CONFIG_CMA. Older code uses CONFIG_DMA_CMA. Switch to using the newer CONFIG_CMA to ensure the code gets compiled when needed. Change-Id: I3cae639797787b4926a6c5e057de973b66196707 Signed-off-by: Laura Abbott <lauraa@codeaurora.org> Signed-off-by: Neha Pandey <nehap@codeaurora.org>
This commit is contained in:
parent
bad999e743
commit
a5e1696551
2 changed files with 2 additions and 2 deletions
|
@ -664,7 +664,7 @@ static int fuse_readpages_fill(void *_data, struct page *page)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DMA_CMA
|
||||
#ifdef CONFIG_CMA
|
||||
if (is_cma_pageblock(page)) {
|
||||
struct page *oldpage = page, *newpage;
|
||||
int err;
|
||||
|
|
|
@ -2900,7 +2900,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|||
entry = pte_to_swp_entry(orig_pte);
|
||||
if (unlikely(non_swap_entry(entry))) {
|
||||
if (is_migration_entry(entry)) {
|
||||
#ifdef CONFIG_DMA_CMA
|
||||
#ifdef CONFIG_CMA
|
||||
/*
|
||||
* FIXME: mszyprow: cruel, brute-force method for
|
||||
* letting cma/migration to finish it's job without
|
||||
|
|
Loading…
Reference in a new issue