diff options
author | Robert Morris <[email protected]> | 2012-08-28 12:57:13 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2012-08-28 12:57:13 -0400 |
commit | c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d (patch) | |
tree | e54d9304b6f5d90bdf7a926808fd7d5923d39526 /vm.c | |
parent | 8960f60b30b69a1f45ffa9d8b2b204714725f1fa (diff) | |
parent | 951b77f7eced2165312d5c12d6256e874dba10f8 (diff) | |
download | xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.tar.gz xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.tar.bz2 xv6-labs-c1ee7eb4d31bd17e48857479fec8f4c2065d4b7d.zip |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -118,15 +118,15 @@ static struct kmap { uint phys_end; int perm; } kmap[] = { - { (void*) KERNBASE, 0, EXTMEM, PTE_W}, // I/O space - { (void*) KERNLINK, V2P(KERNLINK), V2P(data), 0}, // kernel text+rodata - { (void*) data, V2P(data), PHYSTOP, PTE_W}, // kernel data, memory - { (void*) DEVSPACE, DEVSPACE, 0, PTE_W}, // more devices + { (void*)KERNBASE, 0, EXTMEM, PTE_W}, // I/O space + { (void*)KERNLINK, V2P(KERNLINK), V2P(data), 0}, // kernel text+rodata + { (void*)data, V2P(data), PHYSTOP, PTE_W}, // kernel data+memory + { (void*)DEVSPACE, DEVSPACE, 0, PTE_W}, // more devices }; // Set up kernel part of a page table. pde_t* -setupkvm() +setupkvm(void) { pde_t *pgdir; struct kmap *k; |