diff options
| author | Frans Kaashoek <kaashoek@31-34-192.wireless.csail.mit.edu> | 2010-08-31 13:58:50 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@31-34-192.wireless.csail.mit.edu> | 2010-08-31 13:58:50 -0400 |
| commit | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (patch) | |
| tree | 4c9d10f56fe4f69b97820ef94db93f30acda6e65 /proc.c | |
| parent | 791d81cadeb3b30ad6ec67c61086c6747f3d5ca2 (diff) | |
| parent | 7d7dc9331bf33f77c9c3a71350782dadae8dd371 (diff) | |
| download | xv6-labs-9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20.tar.gz xv6-labs-9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20.tar.bz2 xv6-labs-9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20.zip | |
Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page
Diffstat (limited to 'proc.c')
| -rw-r--r-- | proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -84,7 +84,7 @@ found: release(&ptable.lock); // Allocate kernel stack if possible. - if((p->kstack = kalloc(KSTACKSIZE)) == 0){ + if((p->kstack = kalloc()) == 0){ p->state = UNUSED; return 0; } @@ -169,7 +169,7 @@ fork(void) // Copy process state from p. if (!(np->pgdir = copyuvm(proc->pgdir, proc->sz))) { - kfree(np->kstack, KSTACKSIZE); + kfree(np->kstack); np->kstack = 0; np->state = UNUSED; return -1; @@ -418,7 +418,7 @@ wait(void) if(p->state == ZOMBIE){ // Found one. pid = p->pid; - kfree(p->kstack, KSTACKSIZE); + kfree(p->kstack); p->kstack = 0; freevm(p->pgdir); p->state = UNUSED; |