Use %pS for actual addresses, otherwise you'll get bad output on arches like ppc64 where %pF expects a function descriptor.
Signed-off-by: Scott Wood <[email protected]> Cc: [email protected] --- mm/memblock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 252b77b..a7d4ff3 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -685,7 +685,7 @@ int __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size) int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) { - memblock_dbg(" memblock_free: [%#016llx-%#016llx] %pF\n", + memblock_dbg(" memblock_free: [%#016llx-%#016llx] %pS\n", (unsigned long long)base, (unsigned long long)base + size - 1, (void *)_RET_IP_); @@ -701,7 +701,7 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base, { struct memblock_type *_rgn = &memblock.reserved; - memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n", + memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pS\n", (unsigned long long)base, (unsigned long long)base + size - 1, flags, (void *)_RET_IP_); @@ -1218,7 +1218,7 @@ void * __init memblock_virt_alloc_try_nid_nopanic( phys_addr_t min_addr, phys_addr_t max_addr, int nid) { - memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pF\n", + memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pS\n", __func__, (u64)size, (u64)align, nid, (u64)min_addr, (u64)max_addr, (void *)_RET_IP_); return memblock_virt_alloc_internal(size, align, min_addr, @@ -1250,7 +1250,7 @@ void * __init memblock_virt_alloc_try_nid( { void *ptr; - memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pF\n", + memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=0x%llx max_addr=0x%llx %pS\n", __func__, (u64)size, (u64)align, nid, (u64)min_addr, (u64)max_addr, (void *)_RET_IP_); ptr = memblock_virt_alloc_internal(size, align, @@ -1274,7 +1274,7 @@ void * __init memblock_virt_alloc_try_nid( */ void __init __memblock_free_early(phys_addr_t base, phys_addr_t size) { - memblock_dbg("%s: [%#016llx-%#016llx] %pF\n", + memblock_dbg("%s: [%#016llx-%#016llx] %pS\n", __func__, (u64)base, (u64)base + size - 1, (void *)_RET_IP_); kmemleak_free_part(__va(base), size); @@ -1294,7 +1294,7 @@ void __init __memblock_free_late(phys_addr_t base, phys_addr_t size) { u64 cursor, end; - memblock_dbg("%s: [%#016llx-%#016llx] %pF\n", + memblock_dbg("%s: [%#016llx-%#016llx] %pS\n", __func__, (u64)base, (u64)base + size - 1, (void *)_RET_IP_); kmemleak_free_part(__va(base), size); -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
