Changeset 40c8c17 in mainline for kernel/arch/ia32/src

Timestamp:

2011-11-26T21:37:40Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

38ff925

Parents:

056ddc30

Message:

Replace multiple definitions of last_frame with config.physmem_end.
Do not duplicate code which calculates the end of physical memory.

Location:

kernel/arch/ia32/src/mm

Files:

• frame.c (modified) (2 diffs)
• page.c (modified) (1 diff)

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

@@ -49 +49 @@
 size_t hardcoded_unmapped_kdata_size = 0;
 
-// XXX: remove me
-uintptr_t last_frame = 0;
-
 static void init_e820_memory(pfn_t minconf, bool low)
 {
@@ -85 +82 @@
                                     ZONE_AVAILABLE | ZONE_HIGHMEM);
                         }
-                        
-                        // XXX: remove me
-                        if (last_frame < new_base + new_size)
-                                last_frame = new_base + new_size;
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||
                     (e820table[i].type == MEMMAP_MEMORY_NVS)) {

kernel/arch/ia32/src/mm/page.c

@@ -66 +66 @@
         
         /*
-         * PA2KA(identity) mapping for all frames until last_frame.
+         * PA2KA(identity) mapping for all low-memory frames.
          */
         page_table_lock(AS_KERNEL, true);
-        for (cur = 0; cur < min(config.identity_size, last_frame);
+        for (cur = 0; cur < min(config.identity_size, config.physmem_end);
             cur += FRAME_SIZE) {
                 flags = PAGE_CACHEABLE | PAGE_WRITE;
-                if ((PA2KA(cur) >= config.base) && (PA2KA(cur) <
-                    config.base + config.kernel_size))
+                if ((PA2KA(cur) >= config.base) &&
+                    (PA2KA(cur) < config.base + config.kernel_size))
                         flags |= PAGE_GLOBAL;
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);