aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index b8bcf6da8a77..f7fb20021d48 100644
--- a/init/main.c
+++ b/init/main.c
@@ -697,7 +697,7 @@ static void __init do_one_initcall(initcall_t fn)
697{ 697{
698 int count = preempt_count(); 698 int count = preempt_count();
699 ktime_t t0, t1, delta; 699 ktime_t t0, t1, delta;
700 char msgbuf[40]; 700 char msgbuf[64];
701 int result; 701 int result;
702 702
703 if (initcall_debug) { 703 if (initcall_debug) {
@@ -722,11 +722,11 @@ static void __init do_one_initcall(initcall_t fn)
722 sprintf(msgbuf, "error code %d ", result); 722 sprintf(msgbuf, "error code %d ", result);
723 723
724 if (preempt_count() != count) { 724 if (preempt_count() != count) {
725 strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf)); 725 strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
726 preempt_count() = count; 726 preempt_count() = count;
727 } 727 }
728 if (irqs_disabled()) { 728 if (irqs_disabled()) {
729 strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf)); 729 strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
730 local_irq_enable(); 730 local_irq_enable();
731 } 731 }
732 if (msgbuf[0]) { 732 if (msgbuf[0]) {