Changeset bd48f4c in mainline for kernel/arch/ppc32/src/mm/frame.c

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/arch/ppc32/src/mm/frame.c (modified) (2 diffs)

kernel/arch/ppc32/src/mm/frame.c

@@ -45 +45 @@
 void physmem_print(void)
 {
-        printf("Base       Size\n");
-        printf("---------- ----------\n");
+        printf("[base    ] [size    ]\n");
         
         size_t i;
@@ -61 +60 @@
         
         for (i = 0; i < memmap.cnt; i++) {
-                pfn_t start = ADDR2PFN(ALIGN_UP((uintptr_t) memmap.zones[i].start,
-                    FRAME_SIZE));
-                size_t size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
+                /* To be safe, make the available zone possibly smaller */
+                uintptr_t new_start = ALIGN_UP((uintptr_t) memmap.zones[i].start,
+                    FRAME_SIZE);
+                size_t new_size = ALIGN_DOWN(memmap.zones[i].size -
+                    (new_start - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
+                
+                pfn_t pfn = ADDR2PFN(new_start);
+                size_t count = SIZE2FRAMES(new_size);
                 
                 pfn_t conf;
-                if ((minconf < start) || (minconf >= start + size))
-                        conf = start;
+                if ((minconf < pfn) || (minconf >= pfn + count))
+                        conf = pfn;
                 else
                         conf = minconf;
                 
-                zone_create(start, size, conf, 0);
-                if (last_frame < ALIGN_UP((uintptr_t) memmap.zones[i].start
-                    + memmap.zones[i].size, FRAME_SIZE))
-                        last_frame = ALIGN_UP((uintptr_t) memmap.zones[i].start
-                            + memmap.zones[i].size, FRAME_SIZE);
+                zone_create(pfn, count, conf, 0);
+                
+                if (last_frame < ALIGN_UP(new_start + new_size, FRAME_SIZE))
+                        last_frame = ALIGN_UP(new_start + new_size, FRAME_SIZE);
         }