Changeset 4cc2ddd in mainline for kernel/arch/amd64/src

Timestamp:

2008-01-15T13:19:35Z (18 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

Location:

kernel/arch/amd64/src

Files:

• amd64.c (modified) (5 diffs)
• mm/page.c (modified) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -72 +72 @@
 static void clean_IOPL_NT_flags(void)
 {
-        asm
-        (
-                "pushfq;"
-                "pop %%rax;"
-                "and $~(0x7000),%%rax;"
-                "pushq %%rax;"
-                "popfq;"
-                :
-                :
-                :"%rax"
+        asm (
+                "pushfq\n"
+                "pop %%rax\n"
+                "and $~(0x7000), %%rax\n"
+                "pushq %%rax\n"
+                "popfq\n"
+                :
+                :
+                : "%rax"
         );
 }
@@ -91 +90 @@
 static void clean_AM_flag(void)
 {
-        asm
-        (
-                "mov %%cr0,%%rax;"
-                "and $~(0x40000),%%rax;"
-                "mov %%rax,%%cr0;"
-                :
-                :
-                :"%rax"
+        asm (
+                "mov %%cr0, %%rax\n"
+                "and $~(0x40000), %%rax\n"
+                "mov %%rax, %%cr0\n"
+                :
+                :
+                : "%rax"
         );
 }
@@ -128 +126 @@
 }
 
+
 void arch_post_mm_init(void)
 {
@@ -136 +135 @@
                 /* hard clock */
                 i8254_init();
-
+                                
 #ifdef CONFIG_FB
                 if (vesa_present()) 
@@ -149 +148 @@
                 zone_merge_all();
         }
+        
         /* Setup fast SYSCALL/SYSRET */
         syscall_setup_cpu();
-        
 }
 

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

@@ -88 +88 @@
         if (config.cpu_active == 1) {
                 page_mapping_operations = &pt_mapping_operations;
-                
+
                 /*
                  * PA2KA(identity) mapping for all frames.
@@ -96 +96 @@
                         page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, identity_flags);
                 }
+                
                 /* Upper kernel mapping
                  * - from zero to top of kernel (include bottom addresses
-                 *   because some are needed for init )
+                 *   because some are needed for init)
                  */
                 for (cur = PA2KA_CODE(0); cur < config.base + config.kernel_size; cur += FRAME_SIZE)