summaryrefslogtreecommitdiff
path: root/kalloc.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-15 20:11:13 -0400
committerFrans Kaashoek <[email protected]>2011-08-15 20:11:13 -0400
commita4b213cf49cccc8287e638badaac10d0521d5886 (patch)
tree095d550b12eeb48d224193a7401e6793fe7c1d50 /kalloc.c
parent944964685325aa63a59e5e84d8fd0ba5af45ec8c (diff)
downloadxv6-labs-a4b213cf49cccc8287e638badaac10d0521d5886.tar.gz
xv6-labs-a4b213cf49cccc8287e638badaac10d0521d5886.tar.bz2
xv6-labs-a4b213cf49cccc8287e638badaac10d0521d5886.zip
Avoid "boot" in xv6
Diffstat (limited to 'kalloc.c')
-rw-r--r--kalloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kalloc.c b/kalloc.c
index cf89dd4..4cc4202 100644
--- a/kalloc.c
+++ b/kalloc.c
@@ -21,15 +21,15 @@ struct {
extern char end[]; // first address after kernel loaded from ELF file
char *newend;
-// simple page allocator to get off the ground during boot
+// simple page allocator to get off the ground during entry
char *
-boot_alloc(void)
+enter_alloc(void)
{
if (newend == 0)
newend = end;
if ((uint) newend >= KERNBASE + 0x400000)
- panic("only first 4Mbyte are mapped during boot");
+ panic("only first 4Mbyte are mapped during entry");
void *p = (void*)PGROUNDUP((uint)newend);
memset(p, 0, PGSIZE);
newend = newend + PGSIZE;