From a5e1696551e10346cecab669c5a01411301da460 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 17 Dec 2012 18:33:37 -0800 Subject: [PATCH] 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 Signed-off-by: Neha Pandey --- fs/fuse/file.c | 2 +- mm/memory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 6e0f58b8d74f..6b8322225a10 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -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; diff --git a/mm/memory.c b/mm/memory.c index b2baf3614704..a240b04d0848 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -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