Changeset 66be0288 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2014-01-17T17:02:59Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

476f62c, facc34d

Parents:

2e80321 (diff), 61b5b73d (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:

Mainline changes

File:

• kernel/generic/src/proc/program.c (modified) (4 diffs)

kernel/generic/src/proc/program.c

@@ -49 +49 @@
 #include <lib/elf_load.h>
 #include <errno.h>
-#include <print.h>
+#include <log.h>
 #include <syscall/copy.h>
 #include <proc/program.h>
@@ -155 +155 @@
                 
                 program_loader = image_addr;
-                printf("Program loader at %p\n", (void *) image_addr);
+                log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr);
                 
                 return EOK;
@@ -181 +181 @@
         if (!loader) {
                 as_destroy(as);
-                printf("Cannot spawn loader as none was registered\n");
+                log(LF_OTHER, LVL_ERROR,
+                    "Cannot spawn loader as none was registered");
                 return ENOENT;
         }
@@ -189 +190 @@
         if (prg->loader_status != EE_OK) {
                 as_destroy(as);
-                printf("Cannot spawn loader (%s)\n",
+                log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
                     elf_error(prg->loader_status));
                 return ENOENT;