Changeset b7068da in mainline for kernel/generic/src/mm/reserve.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/reserve.c (modified) (5 diffs)

kernel/generic/src/mm/reserve.c

@@ -42 +42 @@
 #include <typedefs.h>
 #include <arch/types.h>
+#include <debug.h>
+
+static bool reserve_initialized = false;
 
 IRQ_SPINLOCK_STATIC_INITIALIZE_NAME(reserve_lock, "reserve_lock");
@@ -54 +57 @@
 {
         reserve = frame_total_free_get();
+        reserve_initialized = true;
 }
 
@@ -67 +71 @@
 {
         bool reserved = false;
+
+        ASSERT(reserve_initialized);
 
         irq_spinlock_lock(&reserve_lock, true);
@@ -111 +117 @@
 void reserve_force_alloc(size_t size)
 {
+        if (!reserve_initialized)
+                return;
+
         irq_spinlock_lock(&reserve_lock, true);
         reserve -= size;
@@ -122 +131 @@
 void reserve_free(size_t size)
 {
+        if (!reserve_initialized)
+                return;
+
         irq_spinlock_lock(&reserve_lock, true);
         reserve += size;