ASoC: tlv320aic32x4: Only enable with common clock

[sfrench/cifs-2.6.git] / mm / cma.c

diff --git a/mm/cma.c b/mm/cma.c
index f4f3a8a57d8623aa4bdbb71ddb232a33a6493378..bb2d333ffcb3128db361fbe6053818e5db677170 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;