diff options
author | Frans Kaashoek <[email protected]> | 2011-08-09 21:37:35 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2011-08-09 21:37:35 -0400 |
commit | 66ba8079c7e376c189ccb3367b8d13825141b8ec (patch) | |
tree | 93343a9d7c9ea75a02c05e4ce078ef2d4a48e2da /defs.h | |
parent | 3a038106431314c85a5950c473b113a7037ac1aa (diff) | |
download | xv6-labs-66ba8079c7e376c189ccb3367b8d13825141b8ec.tar.gz xv6-labs-66ba8079c7e376c189ccb3367b8d13825141b8ec.tar.bz2 xv6-labs-66ba8079c7e376c189ccb3367b8d13825141b8ec.zip |
Use static page table for boot, mapping first 4Mbyte; no more segment trick
Allocate proper kernel page table immediately in main using boot allocator
Remove pginit
Simplify address space layout a tiny bit
More to come (e.g., superpages to simplify static table)
Diffstat (limited to 'defs.h')
-rw-r--r-- | defs.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -62,7 +62,7 @@ extern uchar ioapicid; void ioapicinit(void); // kalloc.c -char* pgalloc(void); +char* boot_alloc(void); char* kalloc(void); void kfree(char*); void kinit(void); @@ -161,11 +161,10 @@ void uartintr(void); void uartputc(int); // vm.c -void pginit(char* (*alloc)()); void seginit(void); void kvmalloc(void); void vmenable(void); -pde_t* setupkvm(void); +pde_t* setupkvm(char* (*alloc)()); char* uva2ka(pde_t*, char*); int allocuvm(pde_t*, uint, uint); int deallocuvm(pde_t*, uint, uint); |