Changeset 5828554 in mainline for kernel/arch/sparc64/src/smp/sun4u/smp.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/smp/sun4u/smp.c (modified) (2 diffs)

kernel/arch/sparc64/src/smp/sun4u/smp.c

@@ -43 +43 @@
 #include <typedefs.h>
 #include <synch/waitq.h>
-#include <print.h>
+#include <log.h>
 #include <arch/cpu_node.h>
 
@@ -108 +108 @@
         if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) ==
             ESYNCH_TIMEOUT)
-                printf("%s: waiting for processor (mid = %" PRIu32
-                    ") timed out\n", __func__, mid);
+                log(LF_ARCH, LVL_NOTE, "%s: waiting for processor (mid = %" PRIu32
+                    ") timed out", __func__, mid);
 }