Changeset 5828554 in mainline for kernel/generic/src/mm/frame.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/generic/src/mm/frame.c (modified) (5 diffs)

kernel/generic/src/mm/frame.c

@@ -54 +54 @@
 #include <arch.h>
 #include <print.h>
+#include <log.h>
 #include <align.h>
 #include <mm/slab.h>
@@ -121 +122 @@
 {
         if (zones.count + 1 == ZONES_MAX) {
-                printf("Maximum zone count %u exceeded!\n", ZONES_MAX);
+                log(LF_OTHER, LVL_ERROR, "Maximum zone count %u exceeded!",
+                    ZONES_MAX);
                 return (size_t) -1;
         }
@@ -141 +143 @@
                             (!iswithin(zones.info[i].base, zones.info[i].count,
                             base, count))) {
-                                printf("Zone (%p, %p) overlaps "
-                                    "with previous zone (%p %p)!\n",
+                                log(LF_OTHER, LVL_WARN,
+                                    "Zone (%p, %p) overlaps "
+                                    "with previous zone (%p %p)!",
                                     (void *) PFN2ADDR(base), (void *) PFN2ADDR(count),
                                     (void *) PFN2ADDR(zones.info[i].base),
@@ -913 +916 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " waiting for %zu frames "
-                    "(%zu available).\n", THREAD->tid, count, avail);
+                log(LF_OTHER, LVL_DEBUG,
+                    "Thread %" PRIu64 " waiting for %zu frames "
+                    "%zu available.", THREAD->tid, count, avail);
 #endif
                 
@@ -938 +942 @@
                 
 #ifdef CONFIG_DEBUG
-                printf("Thread %" PRIu64 " woken up.\n", THREAD->tid);
+                log(LF_OTHER, LVL_DEBUG, "Thread %" PRIu64 " woken up.",
+                    THREAD->tid);
 #endif