[tip:x86/memblock] memblock: Cast phys_addr_t to unsigned long long for printf use

tip-bot for H. Peter Anvin
2011-07-14T21:38:12Z

Commit-ID: a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2
Gitweb: http://git.kernel.org/tip/a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2
Author: H. Peter Anvin <hpa@linux.intel.com>
AuthorDate: Thu, 14 Jul 2011 11:57:10 -0700
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 14 Jul 2011 11:57:10 -0700

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
---
mm/memblock.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 0cb4da6..a75723d 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)
long __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
{
memblock_dbg(" memblock_free: [%#016llx-%#016llx] %pF\n",
- base, base + size, (void *)_RET_IP_);
+ (unsigned long long)base,
+ (unsigned long long)base + size,
+ (void *)_RET_IP_);

return __memblock_remove(&memblock.reserved, base, size);
}
@@ -460,7 +462,9 @@ long __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
struct memblock_type *_rgn = &memblock.reserved;

memblock_dbg("memblock_reserve: [%#016llx-%#016llx] %pF\n",
- base, base + size, (void *)_RET_IP_);
+ (unsigned long long)base,
+ (unsigned long long)base + size,
+ (void *)_RET_IP_);
BUG_ON(0 == size);

return memblock_add_region(_rgn, base, size);