From aeea5cb70978ed657ccd009710b0fdcc59102753 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 14 Jul 2011 11:57:10 -0700 Subject: [PATCH] --- yaml --- r: 277160 b: refs/heads/master c: a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/memblock.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a72bbf37c913..32aba38b30be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24aa07882b672fff2da2f5c955759f0bd13d32d5 +refs/heads/master: a150439c4a97db379f0ed6faa46fbbb6e7bf3cb2 diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c index 0cb4da657b9d..a75723d62631 100644 --- a/trunk/mm/memblock.c +++ b/trunk/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);