Changeset 8b863a62 in mainline for kernel/generic/src/lib/func.c

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/lib/func.c (modified) (2 diffs)

kernel/generic/src/lib/func.c

@@ -37 +37 @@
 
 #include <func.h>
-#include <print.h>
+#include <log.h>
 #include <cpu.h>
 #include <arch/asm.h>
@@ -72 +72 @@
         
         if (CPU)
-                printf("cpu%u: halted\n", CPU->id);
+                log(LF_OTHER, LVL_NOTE, "cpu%u: halted", CPU->id);
         else
-                printf("cpu: halted\n");
+                log(LF_OTHER, LVL_NOTE, "cpu: halted");
         
         cpu_halt();