X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mm%2Fcma.c;h=bb2d333ffcb3128db361fbe6053818e5db677170;hb=f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d;hp=f4f3a8a57d8623aa4bdbb71ddb232a33a6493378;hpb=004cc08675b761fd82288bab1b5ba5e1ca746eca;p=platform%2Fkernel%2Flinux-starfive.git

diff --git a/mm/cma.c b/mm/cma.c
index f4f3a8a..bb2d333 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -327,16 +327,14 @@ int __init cma_declare_contiguous(phys_addr_t base,
 		 * memory in case of failure.
 		 */
 		if (base < highmem_start && limit > highmem_start) {
-			addr = memblock_alloc_range(size, alignment,
-						    highmem_start, limit,
-						    MEMBLOCK_NONE);
+			addr = memblock_phys_alloc_range(size, alignment,
+							 highmem_start, limit);
 			limit = highmem_start;
 		}
 
 		if (!addr) {
-			addr = memblock_alloc_range(size, alignment, base,
-						    limit,
-						    MEMBLOCK_NONE);
+			addr = memblock_phys_alloc_range(size, alignment, base,
+							 limit);
 			if (!addr) {
 				ret = -ENOMEM;
 				goto err;