[PATCH] memblock: Make memblock_dbg macro safer

From: Joe Perches <joe@perches.com>
To: Olof Johansson <olof@lixom.net>, Tejun Heo <tj@kernel.org>
Cc: x86@kernel.org, hpa@zytor.com, mingo@elte.hu, tglx@linutronix.de,
	linux-kernel@vger.kernel.org, matt.fleming@intel.com,
	mjg@redhat.com
Subject: [PATCH] memblock: Make memblock_dbg macro safer
Date: Sun, 12 Feb 2012 13:59:37 -0800	[thread overview]
Message-ID: <1329083977.15485.6.camel@joe2Laptop> (raw)
In-Reply-To: <1329081869-20779-3-git-send-email-olof@lixom.net>

Allow this macro to be used in an if/else block.

Use do {} while (0) and pr_info. (perhaps this should be pr_debug)

Signed-off-by: Joe Perches <joe@perches.com>
---
 include/linux/memblock.h |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index a6bb102..0584d13 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -43,8 +43,11 @@ struct memblock {
 extern struct memblock memblock;
 extern int memblock_debug;
 
-#define memblock_dbg(fmt, ...) \
-	if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+#define memblock_dbg(fmt, ...)					\
+do {								\
+	if (memblock_debug)					\
+		pr_info(fmt, ##__VA_ARGS__);			\
+} while (0)
 
 phys_addr_t memblock_find_in_range_node(phys_addr_t start, phys_addr_t end,
 				phys_addr_t size, phys_addr_t align, int nid);


