|
|
@@ -176,14 +176,24 @@ static int __init cma_activate_area(struct cma *cma)
|
|
|
base_pfn = pfn;
|
|
|
for (j = pageblock_nr_pages; j; --j, pfn++) {
|
|
|
WARN_ON_ONCE(!pfn_valid(pfn));
|
|
|
+ /*
|
|
|
+ * alloc_contig_range requires the pfn range
|
|
|
+ * specified to be in the same zone. Make this
|
|
|
+ * simple by forcing the entire CMA resv range
|
|
|
+ * to be in the same zone.
|
|
|
+ */
|
|
|
if (page_zone(pfn_to_page(pfn)) != zone)
|
|
|
- return -EINVAL;
|
|
|
+ goto err;
|
|
|
}
|
|
|
init_cma_reserved_pageblock(pfn_to_page(base_pfn));
|
|
|
} while (--i);
|
|
|
|
|
|
mutex_init(&cma->lock);
|
|
|
return 0;
|
|
|
+
|
|
|
+err:
|
|
|
+ kfree(cma->bitmap);
|
|
|
+ return -EINVAL;
|
|
|
}
|
|
|
|
|
|
static struct cma cma_areas[MAX_CMA_AREAS];
|