|
@@ -218,9 +218,8 @@ int __init cma_declare_contiguous(phys_addr_t base,
|
|
|
phys_addr_t highmem_start = __pa(high_memory);
|
|
|
int ret = 0;
|
|
|
|
|
|
- pr_debug("%s(size %lx, base %08lx, limit %08lx alignment %08lx)\n",
|
|
|
- __func__, (unsigned long)size, (unsigned long)base,
|
|
|
- (unsigned long)limit, (unsigned long)alignment);
|
|
|
+ pr_debug("%s(size %pa, base %pa, limit %pa alignment %pa)\n",
|
|
|
+ __func__, &size, &base, &limit, &alignment);
|
|
|
|
|
|
if (cma_area_count == ARRAY_SIZE(cma_areas)) {
|
|
|
pr_err("Not enough slots for CMA reserved regions!\n");
|
|
@@ -258,8 +257,8 @@ int __init cma_declare_contiguous(phys_addr_t base,
|
|
|
*/
|
|
|
if (fixed && base < highmem_start && base + size > highmem_start) {
|
|
|
ret = -EINVAL;
|
|
|
- pr_err("Region at %08lx defined on low/high memory boundary (%08lx)\n",
|
|
|
- (unsigned long)base, (unsigned long)highmem_start);
|
|
|
+ pr_err("Region at %pa defined on low/high memory boundary (%pa)\n",
|
|
|
+ &base, &highmem_start);
|
|
|
goto err;
|
|
|
}
|
|
|
|
|
@@ -309,8 +308,8 @@ int __init cma_declare_contiguous(phys_addr_t base,
|
|
|
if (ret)
|
|
|
goto err;
|
|
|
|
|
|
- pr_info("Reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M,
|
|
|
- (unsigned long)base);
|
|
|
+ pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
|
|
|
+ &base);
|
|
|
return 0;
|
|
|
|
|
|
err:
|