aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-07-14 14:57:10 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-07-14 14:57:10 -0400
commita150439c4a97db379f0ed6faa46fbbb6e7bf3cb2 (patch)
tree71b9ae09af66970080a59d246231ed333c1f5b97
parent24aa07882b672fff2da2f5c955759f0bd13d32d5 (diff)
memblock: Cast phys_addr_t to unsigned long long for printf use
phys_addr_t is not necessarily the same thing as unsigned long long. It is, however, easier to cast it to unsigned long long for printf purposes than it is to deal with differnent printf formats. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/4E1F4D2C.3000507@zytor.com
-rw-r--r--mm/memblock.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 0cb4da657b9d..a75723d62631 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -450,7 +450,9 @@ long __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
450long __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) 450long __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
451{ 451{
452 memblock_dbg(" memblock_free: [%#016llx-%#016llx] %pF\n", 452 memblock_dbg(" memblock_free: [%#016llx-%#016llx] %pF\n",
453 base, base + size, (void *)_RET_IP_); 453 (unsigned long long)base,
454 (unsigned long long)base + size,
455 (void *)_RET_IP_);
454 456
455 return __memblock_remove(&memblock.reserved, base, size); 457 return __memblock_remove(&memblock.reserved, base, size);
456} 458}
@@ -460,7 +462,9 @@ long __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
460 struct memblock_type *_rgn = &memblock.reserved; 462 struct memblock_type *_rgn = &memblock.reserved;
461 463
462 memblock_dbg("memblock_reserve: [%#016llx-%#016llx] %pF\n", 464 memblock_dbg("memblock_reserve: [%#016llx-%#016llx] %pF\n",
463 base, base + size, (void *)_RET_IP_); 465 (unsigned long long)base,
466 (unsigned long long)base + size,
467 (void *)_RET_IP_);
464 BUG_ON(0 == size); 468 BUG_ON(0 == size);
465 469
466 return memblock_add_region(_rgn, base, size); 470 return memblock_add_region(_rgn, base, size);