Changes in kernel/arch/ia64/src/mm/frame.c [40c8c17:bbe4828] in mainline

File:

• kernel/arch/ia64/src/mm/frame.c (modified) (1 diff)

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

@@ -51 +51 @@
 #define MINCONF 1
 
-static void frame_common_arch_init(bool low)
+uintptr_t last_frame = 0;
+
+void frame_arch_init(void)
 {
-        unsigned int i;
+        if (config.cpu_active == 1) {
+                unsigned int i;
+                for (i = 0; i < bootinfo->memmap_items; i++) {
+                        if (bootinfo->memmap[i].type == MEMMAP_FREE_MEM) {
+                                uint64_t base = bootinfo->memmap[i].base;
+                                uint64_t size = bootinfo->memmap[i].size;
+                                uint64_t abase = ALIGN_UP(base, FRAME_SIZE);
 
-        for (i = 0; i < bootinfo->memmap_items; i++) {
-                if (bootinfo->memmap[i].type != MEMMAP_FREE_MEM)
-                        continue;
+                                if (size > FRAME_SIZE)
+                                        size -= abase - base;
 
-                uintptr_t base = bootinfo->memmap[i].base;
-                size_t size = bootinfo->memmap[i].size;
-                uintptr_t abase = ALIGN_UP(base, FRAME_SIZE);
-
-                if (size > FRAME_SIZE)
-                        size -= abase - base;
-
-                if (!frame_adjust_zone_bounds(low, &abase, &size))
-                        continue;
-
-                if (size > MIN_ZONE_SIZE) {
-                        pfn_t pfn = ADDR2PFN(abase);
-                        size_t count = SIZE2FRAMES(size);
-
-                        if (low) {
-                                zone_create(pfn, count, max(MINCONF, pfn),
-                                    ZONE_AVAILABLE | ZONE_LOWMEM);
-                        } else {
-                                pfn_t conf;
-
-                                conf = zone_external_conf_alloc(count);
-                                zone_create(pfn, count, conf,
-                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                if (size > MIN_ZONE_SIZE) {
+                                        zone_create(abase >> FRAME_WIDTH,
+                                            size >> FRAME_WIDTH,
+                                            max(MINCONF, abase >> FRAME_WIDTH),
+                                            0);
+                                }
+                                if (abase + size > last_frame)
+                                        last_frame = abase + size;
                         }
                 }
-        }
-}
+                
+                /*
+                 * Blacklist ROM regions.
+                 */
+                frame_mark_unavailable(ADDR2PFN(ROM_BASE),
+                    SIZE2FRAMES(ROM_SIZE));
 
-void frame_low_arch_init(void)
-{
-        if (config.cpu_active > 1)
-                return;
-        
-        frame_common_arch_init(true);
-        
-        /*
-         * Blacklist ROM regions.
-         */
-        frame_mark_unavailable(ADDR2PFN(ROM_BASE),
-            SIZE2FRAMES(ROM_SIZE));
-
-        frame_mark_unavailable(ADDR2PFN(KERNEL_RESERVED_AREA_BASE),
-            SIZE2FRAMES(KERNEL_RESERVED_AREA_SIZE));
-}
-
-void frame_high_arch_init(void)
-{
-        if (config.cpu_active > 1)
-                return;
-        
-        frame_common_arch_init(false);
+                frame_mark_unavailable(ADDR2PFN(KERNEL_RESERVED_AREA_BASE),
+                    SIZE2FRAMES(KERNEL_RESERVED_AREA_SIZE));
+        }       
 }