From 0ab418a73a1400f9e53abb8af0209f352ee4ec4e Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 15 May 2008 13:52:41 -0700
Subject: [PATCH] --- yaml --- r: 96804 b: refs/heads/master c:
 a76bfd0da2321ed0a978ccbef192856ce7ed687a h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/init/main.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b8f38ced912..01afe9ae8711 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0df154f45e40677781e971daec6c430cb34716b
+refs/heads/master: a76bfd0da2321ed0a978ccbef192856ce7ed687a
diff --git a/trunk/init/main.c b/trunk/init/main.c
index b8bcf6da8a77..f7fb20021d48 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -697,7 +697,7 @@ static void __init do_one_initcall(initcall_t fn)
 {
 	int count = preempt_count();
 	ktime_t t0, t1, delta;
-	char msgbuf[40];
+	char msgbuf[64];
 	int result;
 
 	if (initcall_debug) {
@@ -722,11 +722,11 @@ static void __init do_one_initcall(initcall_t fn)
 		sprintf(msgbuf, "error code %d ", result);
 
 	if (preempt_count() != count) {
-		strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+		strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
 		preempt_count() = count;
 	}
 	if (irqs_disabled()) {
-		strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
+		strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
 		local_irq_enable();
 	}
 	if (msgbuf[0]) {