Skip to content

Commit

Permalink
memblock: Improve debug output when resizing the reserve array
Browse files Browse the repository at this point in the history
Print out the location info in addition to which array is being
resized. Also use memblocK_dbg() to put that under control of
the memblock_debug flag.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Yinghai Lu authored and Benjamin Herrenschmidt committed Aug 5, 2010
1 parent 5e63cf4 commit ea9e437
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions mm/memblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ static int memblock_double_array(struct memblock_type *type)
if (!memblock_can_resize)
return -1;

pr_debug("memblock: %s array full, doubling...", memblock_type_name(type));

/* Calculate new doubled size */
old_size = type->max * sizeof(struct memblock_region);
new_size = old_size << 1;
Expand Down Expand Up @@ -221,6 +219,9 @@ static int memblock_double_array(struct memblock_type *type)
}
new_array = __va(addr);

memblock_dbg("memblock: %s array is doubled to %ld at [%#010llx-%#010llx]",
memblock_type_name(type), type->max * 2, (u64)addr, (u64)addr + new_size - 1);

/* Found space, we now need to move the array over before
* we add the reserved region since it may be our reserved
* array itself that is full.
Expand Down Expand Up @@ -672,7 +673,7 @@ static void memblock_dump(struct memblock_type *region, char *name)
base = region->regions[i].base;
size = region->regions[i].size;

pr_info(" %s[0x%x]\t0x%016llx - 0x%016llx, 0x%llx bytes\n",
pr_info(" %s[%#x]\t[%#016llx-%#016llx], %#llx bytes\n",
name, i, base, base + size - 1, size);
}
}
Expand Down

0 comments on commit ea9e437

Please sign in to comment.