Changeset fd07e57b in mainline for kernel/arch/sparc64/src/trap/sun4u/interrupt.c

Timestamp:

2014-01-05T21:25:41Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

4aa2a27

Parents:

aacdb8e (diff), ca05e9b (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 cherrypicked kernel logger.

• Old klog sybsystem was renamed to kio
• Kernel and user-space log messages are stored in both logs (kernel logs end up in log/kernel file)

File:

• kernel/arch/sparc64/src/trap/sun4u/interrupt.c (modified) (2 diffs)

kernel/arch/sparc64/src/trap/sun4u/interrupt.c

@@ -42 +42 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <print.h>
+#include <log.h>
 #include <arch.h>
 #include <mm/tlb.h>
@@ -96 +96 @@
                  */
 #ifdef CONFIG_DEBUG
-                printf("cpu%u: spurious interrupt (intrcv=%#" PRIx64
-                    ", data0=%#" PRIx64 ")\n", CPU->id, intrcv, data0);
+                log(LF_ARCH, LVL_DEBUG,
+                    "cpu%u: spurious interrupt (intrcv=%#" PRIx64 ", data0=%#"
+                    PRIx64 ")", CPU->id, intrcv, data0);
 #else
                 (void) intrcv;