diff options
author | Frans Kaashoek <[email protected]> | 2010-08-31 13:58:50 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2010-08-31 13:58:50 -0400 |
commit | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (patch) | |
tree | 4c9d10f56fe4f69b97820ef94db93f30acda6e65 /main.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 'main.c')
-rw-r--r-- | main.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -28,7 +28,7 @@ main(void) void jkstack(void) { - char *kstack = kalloc(PGSIZE); + char *kstack = kalloc(); if (!kstack) panic("jkstack\n"); char *top = kstack + PGSIZE; @@ -92,7 +92,7 @@ bootothers(void) continue; // Fill in %esp, %eip and start code on cpu. - stack = kalloc(KSTACKSIZE); + stack = kalloc(); *(void**)(code-4) = stack + KSTACKSIZE; *(void**)(code-8) = mpmain; lapicstartap(c->id, (uint)code); |