Changeset 4cc2ddd in mainline for kernel/arch/ia32/src/mm/frame.c

Timestamp:

2008-01-15T13:19:35Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

62da45a

Parents:

22e8166d

Message:

amd64: shorten kernel address space by 2 GB to support proper mapping of more than 2 GB of physical memory

File:

• kernel/arch/ia32/src/mm/frame.c (modified) (3 diffs)

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

@@ -62 +62 @@
         for (i = 0; i < e820counter; i++) {
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
-                        start = ADDR2PFN(ALIGN_UP(e820table[i].base_address,
-                                                  FRAME_SIZE));
-                        size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size,
-                                                   FRAME_SIZE));
-                        if (minconf < start || minconf >= start + size)
+                        start = ADDR2PFN(ALIGN_UP(e820table[i].base_address, FRAME_SIZE));
+                        size = SIZE2FRAMES(ALIGN_DOWN(e820table[i].size, FRAME_SIZE));
+                        if ((minconf < start) || (minconf >= start + size))
                                 conf = start;
                         else
@@ -112 +110 @@
 {
         static pfn_t minconf;
-
+        
         if (config.cpu_active == 1) {
                 cmd_initialize(&e820_info);
                 cmd_register(&e820_info);
 
-
                 minconf = 1;
 #ifdef CONFIG_SMP
                 minconf = max(minconf,
-                              ADDR2PFN(AP_BOOT_OFFSET+hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size));
+                        ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size));
 #endif
 #ifdef CONFIG_SIMICS_FIX
@@ -134 +131 @@
                 /* Reserve AP real mode bootstrap memory */
                 frame_mark_unavailable(AP_BOOT_OFFSET >> FRAME_WIDTH, 
-                                       (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
+                        (hardcoded_unmapped_ktext_size + hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
                 
 #ifdef CONFIG_SIMICS_FIX
                 /* Don't know why, but these addresses help */
-                frame_mark_unavailable(0xd000 >> FRAME_WIDTH,3);
+                frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
 #endif
 #endif