Merge tag 'for-linus-5.1b-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / mm / cma.c

diff --git a/mm/cma.c b/mm/cma.c
index f4f3a8a..bb2d333 100644 (file)
--- 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;