Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56fa4f60 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Marek Szyprowski
Browse files

mm: cma: Use %pa to print physical addresses 



Casting physical addresses to unsigned long and using %lu truncates the
values on systems where physical addresses are larger than 32 bits. Use
%pa and get rid of the cast instead.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parent 16195ddd

mm/cma.c

+6 −7
Original line number Diff line number Diff line
@@ -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: