Changeset a33f0a6 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2011-08-03T17:34:57Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

• kernel/generic/src/mm/frame.c (modified) (4 diffs)

kernel/generic/src/mm/frame.c

@@ -182 +182 @@
  *
  */
-#ifdef CONFIG_DEBUG
-NO_TRACE static size_t total_frames_free(void)
+NO_TRACE static size_t frame_total_free_get_internal(void)
 {
         size_t total = 0;
         size_t i;
+
         for (i = 0; i < zones.count; i++)
                 total += zones.info[i].free_count;
@@ -192 +192 @@
         return total;
 }
-#endif /* CONFIG_DEBUG */
+
+NO_TRACE size_t frame_total_free_get(void)
+{
+        size_t total;
+
+        irq_spinlock_lock(&zones.lock, true);
+        total = frame_total_free_get_internal();
+        irq_spinlock_unlock(&zones.lock, true);
+
+        return total;
+}
+
 
 /** Find a zone with a given frames.
@@ -840 +851 @@
                         buddy_system_free(zone->buddy_system, &zone->frames[i].buddy_link);
                 }
-
-                /* "Unreserve" new frames. */
-                reserve_free(count);
         } else
                 zone->frames = NULL;
@@ -1051 +1059 @@
                 
 #ifdef CONFIG_DEBUG
-                size_t avail = total_frames_free();
+                size_t avail = frame_total_free_get_internal();
 #endif