[PATCH 18/25] x86, lmb: Use lmb_debug to control debug message print out

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Tuesday, June 22, 2010 - 10:26 am

Also let lmb_reserve_range/lmb_free_range could print out name if lmb=debug is
specified

will also print ther name when reserve_lmb_area/free_lmb_area are called.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 arch/x86/mm/lmb.c |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index bd2f60b..209f25b 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -122,10 +122,12 @@ static void __init subtract_lmb_reserved(struct range *range, int az)
 
 	count  = lmb.reserved.cnt;
 
-	pr_info("Subtract (%d early reservations)\n", count);
+	if (lmb_debug)
+		pr_info("Subtract (%d early reservations)\n", count);
 
 	for_each_lmb(reserved, r) {
-		pr_info("  [%010llx - %010llx]\n", (u64)r->base, (u64)r->base + r->size);
+		if (lmb_debug)
+			pr_info("  [%010llx - %010llx]\n", (u64)r->base, (u64)r->base + r->size);
 		final_start = PFN_DOWN(r->base);
 		final_end = PFN_UP(r->base + r->size);
 		if (final_start >= final_end)
@@ -198,16 +200,20 @@ void __init lmb_to_bootmem(u64 start, u64 end)
 		lmb_free(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
 
 	count  = lmb.reserved.cnt;
-	pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end);
+	if (lmb_debug)
+		pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end);
 	for_each_lmb(reserved, r) {
-		pr_info("  [%010llx - %010llx] ", (u64)r->base, (u64)r->base + r->size);
+		if (lmb_debug)
+			pr_info("  [%010llx - %010llx] ", (u64)r->base, (u64)r->base + r->size);
 		final_start = max(start, r->base);
 		final_end = min(end, r->base + r->size);
 		if (final_start >= final_end) {
-			pr_cont("\n");
+			if (lmb_debug)
+				pr_cont("\n");
 			continue;
 		}
-		pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end);
+		if (lmb_debug)
+			pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end);
 		reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT);
 	}
 
@@ -289,6 +295,9 @@ void __init lmb_reserve_range(u64 start, u64 end, char *name)
 	if (WARN_ONCE(start > end, "lmb_reserve_range: wrong range [%#llx, %#llx]\n", start, end))
 		return;
 
+	if (lmb_debug)
+		pr_info("    lmb_reserve_range: [%010llx, %010llx] %16s\n", start, end, name);
+
 	lmb_reserve(start, end - start);
 }
 
@@ -300,6 +309,9 @@ void __init lmb_free_range(u64 start, u64 end)
 	if (WARN_ONCE(start > end, "lmb_free_range: wrong range [%#llx, %#llx]\n", start, end))
 		return;
 
+	if (lmb_debug)
+		pr_info("       lmb_free_range: [%010llx, %010llx]\n", start, end);
+
 	lmb_free(start, end - start);
 }
 
-- 
1.6.4.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH -v19 00/25] Use lmb with x86, Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 04/25] lmb: Export LMB_ERROR again, Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 07/25] lmb: Add lmb_find_in_range(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 08/25] x86, lmb: Add lmb_find_in_range_size(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 10/25] x86, lmb: Add lmb_to_bootmem(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 14/25] lmb: Add find_memory_core_early(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 15/25] x86, lmb: Add lmb_find_in_range_node(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 16/25] x86, lmb: Add lmb_free_memory_in_range(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 17/25] x86, lmb: Add lmb_memory_in_range(), Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 18/25] x86, lmb: Use lmb_debug to control debug mes ..., Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 19/25] x86: Use lmb to replace early_res, Yinghai Lu, (Tue Jun 22, 10:26 am)
[PATCH 21/25] x86: Remove not used early_res code, Yinghai Lu, (Tue Jun 22, 10:26 am)
Re: [PATCH 10/25] x86, lmb: Add lmb_to_bootmem(), Bjorn Helgaas, (Tue Jun 29, 10:47 am)
Re: [PATCH -v19 00/25] Use lmb with x86, Bjorn Helgaas, (Tue Jun 29, 11:06 am)
Re: [PATCH 03/25] lmb: Print new doubled array location info, H. Peter Anvin, (Tue Jun 29, 11:38 am)