Changeset 9ebc238 in mainline

Timestamp:

2005-12-04T21:02:53Z (19 years ago)

Author:

Sergey Bondari <bondari@…>

Branches:

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

Children:

4457455

Parents:

cf585c9

Message:

Minor bugfix caused by invalid frame_region_not_free() usage

Files:

• arch/mips32/src/mm/frame.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (3 diffs)

arch/mips32/src/mm/frame.c

@@ -37 +37 @@
 void frame_arch_init(void)
 {
-        /* Disable Everything until load address */
-        frame_region_not_free(0, KA2PA(KERNEL_LOAD_ADDRESS) + FRAME_SIZE);
-        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE-1));
+        zone_create_in_region(KA2PA(KERNEL_LOAD_ADDRESS), config.memory_size & ~(FRAME_SIZE-1));
 }

generic/src/mm/frame.c

@@ -39 +39 @@
 #include <arch.h>
 #include <print.h>
+#include <align.h>
 
 spinlock_t zone_head_lock;       /**< this lock protects zone_head list */
@@ -63 +64 @@
         if (config.cpu_active == 1) {
                 zone_init();
-                frame_region_not_free(config.base, config.base + config.kernel_size + CONFIG_STACK_SIZE);
+                frame_region_not_free(config.base, config.kernel_size);
         }
 
@@ -212 +213 @@
         
         if (size % FRAME_SIZE != 0) {
-                size = size + (FRAME_SIZE - size % FRAME_SIZE);
+                size = ALIGN(size, FRAME_SIZE);
         }
         ASSERT(size % FRAME_SIZE == 0);