Changeset 5e3757d in mainline

Timestamp:

2006-02-08T13:13:04Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5c3243e

Parents:

085d973

Message:

Fix sparc64 and ia64 to work with the changed frame allocator.

Fix ppc32 to at least compile.

Files:

• arch/ia64/include/types.h (modified) (1 diff)
• arch/ia64/src/mm/frame.c (modified) (2 diffs)
• arch/mips32/src/mm/frame.c (modified) (2 diffs)
• arch/ppc32/include/types.h (modified) (1 diff)
• arch/ppc32/src/mm/frame.c (modified) (1 diff)
• arch/sparc64/include/types.h (modified) (1 diff)
• arch/sparc64/src/mm/frame.c (modified) (2 diffs)
• genarch/src/mm/page_ht.c (modified) (1 diff)
• generic/src/mm/buddy.c (modified) (1 diff)

arch/ia64/include/types.h

@@ -43 +43 @@
 
 typedef __u64 __address;
+typedef __u64 pfn_t;
 
 typedef __u64 ipl_t;

arch/ia64/src/mm/frame.c

@@ -41 +41 @@
 void frame_arch_init(void)
 {
+        zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
+        
+
         /*
          * Workaround to prevent slab allocator from allocating frame 0.
@@ -46 +49 @@
          * identity mapped.
          */
-        frame_region_not_free(0, FRAME_SIZE);
+        frame_mark_unavailable(0, 1);
 
         /*
          * Blacklist ROM regions.
          */
-        frame_region_not_free(ROM_BASE, ROM_SIZE);
-        
-        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE-1));
+        frame_mark_unavailable(ADDR2PFN(ROM_BASE), ROM_SIZE >> FRAME_WIDTH);
 }

arch/mips32/src/mm/frame.c

@@ -29 +29 @@
 #include <arch/mm/frame.h>
 #include <mm/frame.h>
-#include <arch/asm/boot.h>
-#include <arch/mm/page.h>
 #include <config.h>
-#include <panic.h>
-#include <print.h>
 #include <arch/drivers/arc.h>
 
@@ -47 +43 @@
                 arc_frame_init();
         else {
-                zone_create(1, (config.memory_size >> PAGE_WIDTH)-1,1,0);
+                zone_create(1, (config.memory_size >> FRAME_WIDTH)-1,1,0);
         }
 }

arch/ppc32/include/types.h

@@ -40 +40 @@
 
 typedef __u32 __address;
+typedef __u32 pfn_t;
 
 typedef __u32 ipl_t;

arch/ppc32/src/mm/frame.c

@@ -34 +34 @@
 void frame_arch_init(void)
 {
-        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE-1));
+        zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
 }

arch/sparc64/include/types.h

@@ -40 +40 @@
 
 typedef __u64 __address;
+typedef __u64 pfn_t;
 
 typedef __u64 ipl_t;

arch/sparc64/src/mm/frame.c

@@ -33 +33 @@
 void frame_arch_init(void)
 {
+        zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
+
         /*
          * Workaround to prevent slab allocator from allocating frame 0.
@@ -39 +41 @@
          * b) would be confused with NULL error return code
          */
-        frame_region_not_free(0, FRAME_SIZE);
-        
-        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE - 1));
+        frame_mark_unavailable(0, 1);
 }

genarch/src/mm/page_ht.c

@@ -31 +31 @@
 #include <arch/mm/page.h>
 #include <mm/frame.h>
-#include <mm/heap.h>
+#include <mm/slab.h>
 #include <mm/as.h>
 #include <arch/mm/asid.h>

generic/src/mm/buddy.c

@@ -200 +200 @@
         /*
          * Return the other half to buddy system. Mark the first part
-         * full, so that it won't coalsce again.
+         * full, so that it won't coalesce again.
          */
         b->op->mark_busy(b, res);