Changeset 80bcaed in mainline for kernel/arch

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

Files:

• amd64/src/mm/page.c (modified) (1 diff)
• amd64/src/pm.c (modified) (1 diff)
• ia32/src/mm/page.c (modified) (1 diff)
• ia32xen/src/mm/page.c (modified) (1 diff)
• sparc64/include/mm/tsb.h (modified) (2 diffs)

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);

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

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

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

@@ -54 +54 @@
         if (config.cpu_active == 1) {
                 page_mapping_operations = &pt_mapping_operations;
-                AS_KERNEL->page_table = (pte_t *) KA2PA(start_info.ptl0);
+                AS_KERNEL->genarch.page_table = (pte_t *) KA2PA(start_info.ptl0);
         } else
-                SET_PTL0_ADDRESS_ARCH(AS_KERNEL->page_table);
+                SET_PTL0_ADDRESS_ARCH(AS_KERNEL->genarch.page_table);
 }
 

kernel/arch/sparc64/include/mm/tsb.h

@@ -55 +55 @@
 #include <arch/mm/mmu.h>
 #include <arch/types.h>
-#include <mm/as.h>
 
 /** TSB Base register. */
@@ -109 +108 @@
 }
 
-extern void tsb_invalidate(as_t *as, uintptr_t page, count_t pages);
-extern void itsb_pte_copy(pte_t *t);
-extern void dtsb_pte_copy(pte_t *t, bool ro);
+/* Forward declarations. */
+struct as;
+struct pte;
+
+extern void tsb_invalidate(struct as *as, uintptr_t page, count_t pages);
+extern void itsb_pte_copy(struct pte *t);
+extern void dtsb_pte_copy(struct pte *t, bool ro);
 
 #endif /* !def __ASM__ */