From c37f23c20bf4f15b951f1bbbb9c69e42a00dff3c Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Tue, 25 Dec 2012 17:35:51 +0800 Subject: kexec: use dbgprintf instead of #if 0 for debug printing Signed-off-by: Zhang Yanfei [ horms@verge.net.au: Applied manually due to conflict ] Signed-off-by: Simon Horman --- kexec/arch/i386/kexec-x86-common.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'kexec/arch/i386/kexec-x86-common.c') diff --git a/kexec/arch/i386/kexec-x86-common.c b/kexec/arch/i386/kexec-x86-common.c index 02471a8..234823c 100644 --- a/kexec/arch/i386/kexec-x86-common.c +++ b/kexec/arch/i386/kexec-x86-common.c @@ -88,10 +88,9 @@ static int get_memory_ranges_proc_iomem(struct memory_range **range, int *ranges continue; str = line + consumed; end = end + 1; -#if 0 - printf("%016Lx-%016Lx : %s", - start, end, str); -#endif + + dbgprintf("%016Lx-%016Lx : %s", start, end, str); + if (memcmp(str, "System RAM\n", 11) == 0) { type = RANGE_RAM; } @@ -110,10 +109,9 @@ static int get_memory_ranges_proc_iomem(struct memory_range **range, int *ranges memory_range[memory_ranges].start = start; memory_range[memory_ranges].end = end; memory_range[memory_ranges].type = type; -#if 0 - printf("%016Lx-%016Lx : %x\n", - start, end, type); -#endif + + dbgprintf("%016Lx-%016Lx : %x\n", start, end, type); + memory_ranges++; } fclose(fp); @@ -479,17 +477,11 @@ int get_memory_ranges(struct memory_range **range, int *ranges, mem_max = end; } - /* just set 0 to 1 to enable printing for debugging */ -#if 0 - { - int i; - printf("MEMORY RANGES\n"); - for (i = 0; i < *ranges; i++) { - printf("%016Lx-%016Lx (%d)\n", (*range)[i].start, - (*range)[i].end, (*range)[i].type); - } + dbgprintf("MEMORY RANGES\n"); + for (i = 0; i < *ranges; i++) { + dbgprintf("%016Lx-%016Lx (%d)\n", (*range)[i].start, + (*range)[i].end, (*range)[i].type); } -#endif return ret; } -- cgit