Merge "mm: Use correct define for CMA features"
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 6e0f58b..6b83222 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -664,7 +664,7 @@
}
}
-#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 c130853..2111354 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2913,7 +2913,7 @@
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