git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing slides due to renamings
[lunaix-os.git]
/
lunaix-os
/
kernel
/
k_init.c
diff --git
a/lunaix-os/kernel/k_init.c
b/lunaix-os/kernel/k_init.c
index 0b73f92d59e953829b38510146bd1c42268535c3..444aab0e818c1433f78ea03d4973948e54a3ece6 100644
(file)
--- a/
lunaix-os/kernel/k_init.c
+++ b/
lunaix-os/kernel/k_init.c
@@
-4,7
+4,7
@@
#include <lunaix/mm/page.h>
#include <lunaix/mm/pmm.h>
#include <lunaix/mm/vmm.h>
#include <lunaix/mm/page.h>
#include <lunaix/mm/pmm.h>
#include <lunaix/mm/vmm.h>
-#include <lunaix/mm/
dmm
.h>
+#include <lunaix/mm/
kalloc
.h>
#include <lunaix/spike.h>
#include <arch/x86/boot/multiboot.h>
#include <lunaix/spike.h>
#include <arch/x86/boot/multiboot.h>
@@
-61,7
+61,7
@@
_kernel_post_init() {
vmm_unmap_page((void*)(i << PG_SIZE_BITS));
}
vmm_unmap_page((void*)(i << PG_SIZE_BITS));
}
- assert
(dmm_init()
);
+ assert
_msg(kalloc_init(), "Fail to initialize heap"
);
}
// 按照 Memory map 标识可用的物理页
}
// 按照 Memory map 标识可用的物理页