From bf5d770bd234a1e66322dd79c4ae5b397cd2b9c1 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 1 May 2013 13:35:51 -0400 Subject: init: Do not warn on non-zero initcall return Commit f91eb62f71b3 ("init: scream bloody murder if interrupts are enabled too early") added three new warnings. The first two seemed reasonable, but the third included a warning when an initcall returned non-zero. Although, the third WARN() does include an imbalanced preempt disabled, or irqs disable, it shouldn't warn if it only had an initcall that just returns non-zero. In fact, according to Linus, it shouldn't print at all. As it only prints with initcall_debug set, and that already shows enough information to fix things. Link: http://lkml.kernel.org/r/CA+55aFzaBC5SFi7=F2mfm+KWY5qTsBmOqgbbs8E+LUS8JK-sBg@mail.gmail.com Suggested-by: Linus Torvalds Reported-by: Konrad Rzeszutek Wilk Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds diff --git a/init/main.c b/init/main.c index bea1287..ceed17a 100644 --- a/init/main.c +++ b/init/main.c @@ -686,11 +686,8 @@ int __init_or_module do_one_initcall(initcall_t fn) msgbuf[0] = 0; - if (ret && ret != -ENODEV && initcall_debug) - sprintf(msgbuf, "error code %d ", ret); - if (preempt_count() != count) { - strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf)); + sprintf(msgbuf, "preemption imbalance "); preempt_count() = count; } if (irqs_disabled()) { -- cgit v0.10.2