Changeset 19c8030 in mainline

Timestamp:

2011-11-16T10:27:33Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e6c4b94

Parents:

c6f1908e

Message:

Do not update the amount of reserved memory before the reservation
subsystem is initialized.

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;