From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 22 May 2014 00:43:45 +0000 (+1000)
Subject: init-mainc-add-initcall_blacklist-kernel-parameter-fix
X-Git-Tag: next-20140530~2^2~142
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f50dc8785b241bd959f3179d17d6cbf1df46966a;p=karo-tx-linux.git

init-mainc-add-initcall_blacklist-kernel-parameter-fix

tweak printk text

Cc: Andi Kleen <andi@firstfloor.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Josh Boyer <jwboyer@fedoraproject.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Weinberger <richard.weinberger@gmail.com>
Cc: Rob Landley <rob@landley.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/init/main.c b/init/main.c
index 6b275a2ea05b..8ac3833f2bdf 100644
--- a/init/main.c
+++ b/init/main.c
@@ -683,7 +683,7 @@ static int __init initcall_blacklist(char *str)
 	do {
 		str_entry = strsep(&str, ",");
 		if (str_entry) {
-			pr_debug("initcall blacklisted %s\n", str_entry);
+			pr_debug("blacklisting initcall %s\n", str_entry);
 			entry = alloc_bootmem(sizeof(*entry));
 			entry->buf = alloc_bootmem(strlen(str_entry) + 1);
 			strcpy(entry->buf, str_entry);