summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-09 21:37:35 -0400
committerFrans Kaashoek <[email protected]>2011-08-09 21:37:35 -0400
commit66ba8079c7e376c189ccb3367b8d13825141b8ec (patch)
tree93343a9d7c9ea75a02c05e4ce078ef2d4a48e2da /proc.c
parent3a038106431314c85a5950c473b113a7037ac1aa (diff)
downloadxv6-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 'proc.c')
-rw-r--r--proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/proc.c b/proc.c
index 626d03e..96a9c8e 100644
--- a/proc.c
+++ b/proc.c
@@ -83,7 +83,7 @@ userinit(void)
p = allocproc();
initproc = p;
- if((p->pgdir = setupkvm()) == 0)
+ if((p->pgdir = setupkvm(kalloc)) == 0)
panic("userinit: out of memory?");
inituvm(p->pgdir, _binary_initcode_start, (int)_binary_initcode_size);
p->sz = PGSIZE;