diff options
-rw-r--r-- | arch/x86/mm/memblock.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c index 32ddad5dc932..aaff3932588e 100644 --- a/arch/x86/mm/memblock.c +++ b/arch/x86/mm/memblock.c | |||
@@ -118,10 +118,10 @@ static void __init memblock_x86_subtract_reserved(struct range *range, int az) | |||
118 | /* Take out region array itself at first*/ | 118 | /* Take out region array itself at first*/ |
119 | memblock_free_reserved_regions(); | 119 | memblock_free_reserved_regions(); |
120 | 120 | ||
121 | pr_info("Subtract (%ld early reservations)\n", memblock.reserved.cnt); | 121 | memblock_dbg("Subtract (%ld early reservations)\n", memblock.reserved.cnt); |
122 | 122 | ||
123 | for_each_memblock(reserved, r) { | 123 | for_each_memblock(reserved, r) { |
124 | pr_info(" [%010llx-%010llx]\n", (u64)r->base, (u64)r->base + r->size - 1); | 124 | memblock_dbg(" [%010llx-%010llx]\n", (u64)r->base, (u64)r->base + r->size - 1); |
125 | final_start = PFN_DOWN(r->base); | 125 | final_start = PFN_DOWN(r->base); |
126 | final_end = PFN_UP(r->base + r->size); | 126 | final_end = PFN_UP(r->base + r->size); |
127 | if (final_start >= final_end) | 127 | if (final_start >= final_end) |
@@ -193,16 +193,16 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end) | |||
193 | memblock_free_reserved_regions(); | 193 | memblock_free_reserved_regions(); |
194 | 194 | ||
195 | count = memblock.reserved.cnt; | 195 | count = memblock.reserved.cnt; |
196 | pr_info("(%d early reservations) ==> bootmem [%010llx-%010llx]\n", count, start, end - 1); | 196 | memblock_dbg("(%d early reservations) ==> bootmem [%#010llx-%#010llx]\n", count, start, end - 1); |
197 | for_each_memblock(reserved, r) { | 197 | for_each_memblock(reserved, r) { |
198 | pr_info(" [%010llx-%010llx] ", (u64)r->base, (u64)r->base + r->size - 1); | 198 | memblock_dbg(" [%#010llx-%#010llx] ", (u64)r->base, (u64)r->base + r->size - 1); |
199 | final_start = max(start, r->base); | 199 | final_start = max(start, r->base); |
200 | final_end = min(end, r->base + r->size); | 200 | final_end = min(end, r->base + r->size); |
201 | if (final_start >= final_end) { | 201 | if (final_start >= final_end) { |
202 | pr_cont("\n"); | 202 | memblock_dbg("\n"); |
203 | continue; | 203 | continue; |
204 | } | 204 | } |
205 | pr_cont(" ==> [%010llx-%010llx]\n", final_start, final_end - 1); | 205 | memblock_dbg(" ==> [%#010llx-%#010llx]\n", final_start, final_end - 1); |
206 | reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT); | 206 | reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT); |
207 | } | 207 | } |
208 | 208 | ||
@@ -280,9 +280,11 @@ void __init memblock_x86_reserve_range(u64 start, u64 end, char *name) | |||
280 | if (start == end) | 280 | if (start == end) |
281 | return; | 281 | return; |
282 | 282 | ||
283 | if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx]\n", start, end)) | 283 | if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx)\n", start, end)) |
284 | return; | 284 | return; |
285 | 285 | ||
286 | memblock_dbg(" memblock_x86_reserve_range: [%#010llx-%#010llx] %16s\n", start, end - 1, name); | ||
287 | |||
286 | memblock_reserve(start, end - start); | 288 | memblock_reserve(start, end - start); |
287 | } | 289 | } |
288 | 290 | ||
@@ -291,9 +293,11 @@ void __init memblock_x86_free_range(u64 start, u64 end) | |||
291 | if (start == end) | 293 | if (start == end) |
292 | return; | 294 | return; |
293 | 295 | ||
294 | if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx]\n", start, end)) | 296 | if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx)\n", start, end)) |
295 | return; | 297 | return; |
296 | 298 | ||
299 | memblock_dbg(" memblock_x86_free_range: [%#010llx-%#010llx]\n", start, end - 1); | ||
300 | |||
297 | memblock_free(start, end - start); | 301 | memblock_free(start, end - start); |
298 | } | 302 | } |
299 | 303 | ||