Changeset 9d5e23c in mainline for arch

Timestamp:

2005-12-07T23:52:25Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ac0cb2a

Parents:

f62355a

Message:

Fixed bug in Intel32/AMD64 boot, that could cause page fault on boot.
Fixes of configuration program.

Location:

arch

Files:

• amd64/src/mm/page.c (modified) (2 diffs)
• ia32/include/mm/frame.h (modified) (1 diff)
• ia32/src/mm/page.c (modified) (2 diffs)

arch/amd64/src/mm/page.c

@@ -36 +36 @@
 #include <memstr.h>
 
-__address bootstrap_dba; 
+static __address bootstrap_dba; 
 
 void page_arch_init(void)
@@ -60 +60 @@
         }
         else {
-                /*
-                 * Application processors need to create their own view of the
-                 * virtual address space. Because of that, each AP copies
-                 * already-initialized paging information from the bootstrap
-                 * processor and adjusts it to fulfill its needs.
-                 */
-
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
-                memcpy((void *)dba, (void *)bootstrap_dba , PAGE_SIZE);
-                write_cr3(KA2PA(dba));
+                write_cr3(KA2PA(bootstrap_dba));
         }
 }

arch/ia32/include/mm/frame.h

@@ -34 +34 @@
 #define FRAME_SIZE      4096
 
-extern __address bootstrap_dba;
 extern __address last_frame;
 

arch/ia32/src/mm/page.c

@@ -41 +41 @@
 #include <print.h>
 
-__address bootstrap_dba; 
+static __address bootstrap_dba; 
 
 void page_arch_init(void)
@@ -64 +64 @@
         }
         else {
-                /*
-                 * Application processors need to create their own view of the
-                 * virtual address space. Because of that, each AP copies
-                 * already-initialized paging information from the bootstrap
-                 * processor and adjusts it to fulfill its needs.
-                 */
-
-                dba = frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME);
-                memcpy((void *)dba, (void *)bootstrap_dba , PAGE_SIZE);
-                write_cr3(KA2PA(dba));
+                write_cr3(KA2PA(bootstrap_dba));
         }