aboutsummaryrefslogtreecommitdiffstats
path: root/mm/cma.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2014-10-24 06:18:42 -0400
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-10-27 08:00:55 -0400
commit56fa4f609badbe442093409c3d3a051811e54f72 (patch)
tree8b6fa8c53cbf2ae85d418c3aa7aa351ee7253e19 /mm/cma.c
parent16195ddd4ebcc10c30b2f232f8e400df8d464380 (diff)
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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'mm/cma.c')
-rw-r--r--mm/cma.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/mm/cma.c b/mm/cma.c
index c30a6edee65c..fde706e1284f 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -218,9 +218,8 @@ int __init cma_declare_contiguous(phys_addr_t base,
218 phys_addr_t highmem_start = __pa(high_memory); 218 phys_addr_t highmem_start = __pa(high_memory);
219 int ret = 0; 219 int ret = 0;
220 220
221 pr_debug("%s(size %lx, base %08lx, limit %08lx alignment %08lx)\n", 221 pr_debug("%s(size %pa, base %pa, limit %pa alignment %pa)\n",
222 __func__, (unsigned long)size, (unsigned long)base, 222 __func__, &size, &base, &limit, &alignment);
223 (unsigned long)limit, (unsigned long)alignment);
224 223
225 if (cma_area_count == ARRAY_SIZE(cma_areas)) { 224 if (cma_area_count == ARRAY_SIZE(cma_areas)) {
226 pr_err("Not enough slots for CMA reserved regions!\n"); 225 pr_err("Not enough slots for CMA reserved regions!\n");
@@ -258,8 +257,8 @@ int __init cma_declare_contiguous(phys_addr_t base,
258 */ 257 */
259 if (fixed && base < highmem_start && base + size > highmem_start) { 258 if (fixed && base < highmem_start && base + size > highmem_start) {
260 ret = -EINVAL; 259 ret = -EINVAL;
261 pr_err("Region at %08lx defined on low/high memory boundary (%08lx)\n", 260 pr_err("Region at %pa defined on low/high memory boundary (%pa)\n",
262 (unsigned long)base, (unsigned long)highmem_start); 261 &base, &highmem_start);
263 goto err; 262 goto err;
264 } 263 }
265 264
@@ -309,8 +308,8 @@ int __init cma_declare_contiguous(phys_addr_t base,
309 if (ret) 308 if (ret)
310 goto err; 309 goto err;
311 310
312 pr_info("Reserved %ld MiB at %08lx\n", (unsigned long)size / SZ_1M, 311 pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
313 (unsigned long)base); 312 &base);
314 return 0; 313 return 0;
315 314
316err: 315err: