Merge branch 'master' of git+ssh://am.lcs/home/am0/6.828/xv6

This commit is contained in:
Austin Clements 2010-09-01 00:31:04 -04:00
commit 5c4dc7395b

View file

@ -24,10 +24,9 @@ kinit(void)
extern char end[]; extern char end[];
initlock(&kmem.lock, "kmem"); initlock(&kmem.lock, "kmem");
char *p1 = (char*)PGROUNDUP((uint)end); char *p = (char*)PGROUNDUP((uint)end);
char *p2 = PGROUNDDOWN(PHYSTOP); for( ; p + PGSIZE - 1 < (char*) PHYSTOP; p += PGSIZE)
for( ; p1 < p2; p1 += 4096) kfree(p);
kfree(p1);
} }
//PAGEBREAK: 21 //PAGEBREAK: 21