Changeset 80bcaed in mainline for kernel/arch/amd64/src

Timestamp:

2007-02-03T13:22:24Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f619ec11

Parents:

fa8e7d2

Message:

Merge as_t structure into one and leave the differring parts in as_genarch_t.

Indentation and formatting changes in header files.

Location:

kernel/arch/amd64/src

Files:

• mm/page.c (modified) (1 diff)
• pm.c (modified) (1 diff)

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

@@ -112 +112 @@
 
                 exc_register(14, "page_fault", (iroutine) page_fault);
-                write_cr3((uintptr_t) AS_KERNEL->page_table);
-        }
-        else {
-                write_cr3((uintptr_t) AS_KERNEL->page_table);
+                write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
+        }
+        else {
+                write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
         }
 }

kernel/arch/amd64/src/pm.c

@@ -202 +202 @@
                  * non boot-mapped pointer, initialize the CR3 register
                  * ahead of page_init */
-                write_cr3((uintptr_t) AS_KERNEL->page_table);
+                write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
 
                 tss_p = (struct tss *) malloc(sizeof(tss_t), FRAME_ATOMIC);