commit 11451f463b73469b8c1abfbb6b92c228209b915e
author Linux Build Service Account <lnxbuild@localhost> Thu Dec 20 03:02:25 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 20 03:02:24 2012 -0800
tree 13cc7ec18b4b719e03e17ad4b24c09687fe3efa2
parent ee5b2a19dbbff4d691711467588c0646b39260e5
parent 6975529f4f8f1477f6e8d469f1260ff767511230

Merge "mm: Use correct define for CMA features"

fs/fuse/file.c

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;

mm/memory.c

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