From: Mel Gorman <mel@csn.ul.ie>

This patch is a fix to
mm-add-a-basic-debugging-framework-for-memory-initialisation.patch pointed out
by an off-list reviewer. The intention of the code was to change the printk
loglevel depending on the message level passed to mminit_dprintk(). What
actually happens is that for MMINIT_WARNING and levels, only the loglevel
is sent to printk() and not the message. This patch fixes the code to behave
as intended.

It can be folded safely into
mm-add-a-basic-debugging-framework-for-memory-initialisation.patch without
causing collisions later in the set.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/internal.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN mm/internal.h~mm-add-a-basic-debugging-framework-for-memory-initialisation-fix mm/internal.h
--- a/mm/internal.h~mm-add-a-basic-debugging-framework-for-memory-initialisation-fix
+++ a/mm/internal.h
@@ -73,8 +73,8 @@ extern int mminit_loglevel;
 #define mminit_dprintk(level, prefix, fmt, arg...) \
 do { \
 	if (level < mminit_loglevel) { \
-		printk(level <= MMINIT_WARNING ? KERN_WARNING : KERN_DEBUG \
-			"mminit:: " prefix " " fmt, ##arg); \
+		printk(level <= MMINIT_WARNING ? KERN_WARNING : KERN_DEBUG); \
+		printk(KERN_CONT "mminit::" prefix " " fmt, ##arg); \
 	} \
 } while (0)
 
_