summaryrefslogtreecommitdiff
path: root/umalloc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2010-08-31 13:58:50 -0400
committerFrans Kaashoek <[email protected]>2010-08-31 13:58:50 -0400
commit9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (patch)
tree4c9d10f56fe4f69b97820ef94db93f30acda6e65 /umalloc.c
parent791d81cadeb3b30ad6ec67c61086c6747f3d5ca2 (diff)
parent7d7dc9331bf33f77c9c3a71350782dadae8dd371 (diff)
downloadxv6-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 'umalloc.c')
-rw-r--r--umalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/umalloc.c b/umalloc.c
index afc86a5..4984591 100644
--- a/umalloc.c
+++ b/umalloc.c
@@ -49,8 +49,8 @@ morecore(uint nu)
char *p;
Header *hp;
- if(nu < PAGE)
- nu = PAGE;
+ if(nu < 4096)
+ nu = 4096;
p = sbrk(nu * sizeof(Header));
if(p == (char*) -1)
return 0;