summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2010-08-31 15:39:25 -0400
committerRobert Morris <[email protected]>2010-08-31 15:39:25 -0400
commit8d774afb2d45592d85725474a704ac99b0624d2c (patch)
tree5a745a3a37c9bed426f27d72f151de48ac3bcaa1 /main.c
parent880ee18ab14477b669a6b95707721322bfe086c1 (diff)
downloadxv6-labs-8d774afb2d45592d85725474a704ac99b0624d2c.tar.gz
xv6-labs-8d774afb2d45592d85725474a704ac99b0624d2c.tar.bz2
xv6-labs-8d774afb2d45592d85725474a704ac99b0624d2c.zip
no more pminit, or ELF header at 0x10000
kinit() knows about end and PHYSTOP map all of kernel read/write (rather than r/o instructions) thanks, austin
Diffstat (limited to 'main.c')
-rw-r--r--main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.c b/main.c
index 878ea36..cb6e6ce 100644
--- a/main.c
+++ b/main.c
@@ -21,7 +21,7 @@ main(void)
ioapicinit(); // another interrupt controller
consoleinit(); // I/O devices & their interrupts
uartinit(); // serial port
- pminit(); // discover how much memory there is
+ kinit(); // initialize memory allocator
jkstack(); // call mainc() on a properly-allocated stack
}