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

Timestamp:

2014-01-19T14:37:22Z (11 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/sun4v/md.c (modified) (2 diffs)

kernel/arch/sparc64/src/sun4v/md.c

@@ -36 +36 @@
 #include <panic.h>
 #include <func.h>
-#include <print.h>
+#include <log.h>
 #include <str.h>
 #include <arch/sun4v/md.h>
@@ -310 +310 @@
         retval = retval;
         if (retval != HV_EOK) {
-                printf("Could not retrieve machine description, "
-                    "error=%" PRIu64 ".\n", retval);
+                log(LF_ARCH, LVL_ERROR, "Could not retrieve machine "
+                    "description, error=%" PRIu64 ".", retval);
         }
 }