diff options
author | Austin Clements <[email protected]> | 2010-09-01 00:31:04 -0400 |
---|---|---|
committer | Austin Clements <[email protected]> | 2010-09-01 00:31:04 -0400 |
commit | 5c4dc7395b75d8b41c1104fe59a0d14d81a8a428 (patch) | |
tree | e20d8bb0d57b2b86303a0099d38660f2b2d3573a | |
parent | ba04b3e70e4f1916c777d62de53088d96b09579f (diff) | |
parent | 23c3e52c2fb5f1709bf5053a8e93161931b56bf9 (diff) | |
download | xv6-labs-5c4dc7395b75d8b41c1104fe59a0d14d81a8a428.tar.gz xv6-labs-5c4dc7395b75d8b41c1104fe59a0d14d81a8a428.tar.bz2 xv6-labs-5c4dc7395b75d8b41c1104fe59a0d14d81a8a428.zip |
Merge branch 'master' of git+ssh://am.lcs/home/am0/6.828/xv6
-rw-r--r-- | kalloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -24,10 +24,9 @@ kinit(void) extern char end[]; initlock(&kmem.lock, "kmem"); - char *p1 = (char*)PGROUNDUP((uint)end); - char *p2 = PGROUNDDOWN(PHYSTOP); - for( ; p1 < p2; p1 += 4096) - kfree(p1); + char *p = (char*)PGROUNDUP((uint)end); + for( ; p + PGSIZE - 1 < (char*) PHYSTOP; p += PGSIZE) + kfree(p); } //PAGEBREAK: 21 |