summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2012-08-28 12:57:13 -0400
committerRobert Morris <[email protected]>2012-08-28 12:57:13 -0400
commitc1ee7eb4d31bd17e48857479fec8f4c2065d4b7d (patch)
treee54d9304b6f5d90bdf7a926808fd7d5923d39526 /proc.c
parent8960f60b30b69a1f45ffa9d8b2b204714725f1fa (diff)
parent951b77f7eced2165312d5c12d6256e874dba10f8 (diff)
downloadxv6-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 'proc.c')
-rw-r--r--proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/proc.c b/proc.c
index 05cb85f..bcdbfea 100644
--- a/proc.c
+++ b/proc.c
@@ -83,7 +83,7 @@ userinit(void)
p = allocproc();
initproc = p;
- if((p->pgdir = setupkvm(kalloc)) == 0)
+ if((p->pgdir = setupkvm()) == 0)
panic("userinit: out of memory?");
inituvm(p->pgdir, _binary_initcode_start, (int)_binary_initcode_size);
p->sz = PGSIZE;