Changes in kernel/arch/ppc32/src/mm/frame.c [4872160:98000fb] in mainline

File:

• kernel/arch/ppc32/src/mm/frame.c (modified) (5 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32mm
+/** @addtogroup ppc32mm 
  * @{
  */
@@ -41 +41 @@
 
 uintptr_t last_frame = 0;
-memmap_t memmap;
 
 void physmem_print(void)
@@ -50 +49 @@
         printf("---------- ----------\n");
                 
-        for (i = 0; i < memmap.cnt; i++) {
-                printf("%#10x %#10x\n", memmap.zones[i].start,
-                        memmap.zones[i].size);
+        for (i = 0; i < bootinfo.memmap.count; i++) {
+                printf("%#10x %#10x\n", bootinfo.memmap.zones[i].start,
+                        bootinfo.memmap.zones[i].size);
         }
 }
@@ -63 +62 @@
         size_t size;
         
-        for (i = 0; i < memmap.cnt; i++) {
-                start = ADDR2PFN(ALIGN_UP((uintptr_t) memmap.zones[i].start, FRAME_SIZE));
-                size = SIZE2FRAMES(ALIGN_DOWN(memmap.zones[i].size, FRAME_SIZE));
+        for (i = 0; i < bootinfo.memmap.count; i++) {
+                start = ADDR2PFN(ALIGN_UP(bootinfo.memmap.zones[i].start, FRAME_SIZE));
+                size = SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, FRAME_SIZE));
                 
                 if ((minconf < start) || (minconf >= start + size))
@@ -73 +72 @@
                 
                 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);
+                if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
+                        last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
         }