Changeset b0b4592e in mainline for kernel/arch/sparc64/src/trap/sun4u/interrupt.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/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;