Changeset 5828554 in mainline for kernel/arch/sparc64/src/trap/sun4v/interrupt.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/sun4v/interrupt.c (modified) (2 diffs)

kernel/arch/sparc64/src/trap/sun4v/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>
@@ -111 +111 @@
                         ((void (*)(void)) data1)();
                 } else {
-                        printf("Spurious interrupt on %" PRIu64 ", data = %" PRIx64 ".\n",
-                            CPU->arch.id, data1);
+                        log(LF_ARCH, LVL_DEBUG, "Spurious interrupt on %" PRIu64
+                            ", data = %" PRIx64 ".", CPU->arch.id, data1);
                 }
         }