Changeset b0b4592e in mainline for kernel/generic/src/main/kinit.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/main/kinit.c (modified) (6 diffs)

kernel/generic/src/main/kinit.c

@@ -59 +59 @@
 #include <mm/km.h>
 #include <print.h>
+#include <log.h>
 #include <memstr.h>
 #include <console/console.h>
@@ -140 +141 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu%u\n", i);
+                                log(LF_OTHER, LVL_ERROR,
+                                    "Unable to create kcpulb thread for cpu%u", i);
                 }
         }
@@ -156 +158 @@
                 thread_ready(thread);
         else
-                printf("Unable to create kload thread\n");
+                log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
         
 #ifdef CONFIG_KCONSOLE
@@ -168 +170 @@
                         thread_ready(thread);
                 else
-                        printf("Unable to create kconsole thread\n");
+                        log(LF_OTHER, LVL_ERROR,
+                            "Unable to create kconsole thread");
         }
 #endif /* CONFIG_KCONSOLE */
@@ -210 +213 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].paddr % FRAME_SIZE) {
-                        printf("init[%zu]: Address is not frame aligned\n", i);
+                        log(LF_OTHER, LVL_ERROR,
+                            "init[%zu]: Address is not frame aligned", i);
                         programs[i].task = NULL;
                         continue;
@@ -273 +277 @@
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else
-                        printf("init[%zu]: Init binary load failed "
-                            "(error %d, loader status %u)\n", i, rc,
+                        log(LF_OTHER, LVL_ERROR,
+                            "init[%zu]: Init binary load failed "
+                            "(error %d, loader status %u)", i, rc,
                             programs[i].loader_status);
         }