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
feat: alignment option of cake allocator for dma buffer
[lunaix-os.git]
/
lunaix-os
/
kernel
/
proc0.c
diff --git
a/lunaix-os/kernel/proc0.c
b/lunaix-os/kernel/proc0.c
index 3a6ea62116aea40654d96c93ee97a39ac8c1167f..e94397492c06d7a272d4d63e6ba4b0fcb6003983 100644
(file)
--- a/
lunaix-os/kernel/proc0.c
+++ b/
lunaix-os/kernel/proc0.c
@@
-2,7
+2,9
@@
#include <lunaix/common.h>
#include <lunaix/lunistd.h>
#include <lunaix/lxconsole.h>
#include <lunaix/common.h>
#include <lunaix/lunistd.h>
#include <lunaix/lxconsole.h>
+#include <lunaix/mm/cake.h>
#include <lunaix/mm/pmm.h>
#include <lunaix/mm/pmm.h>
+#include <lunaix/mm/valloc.h>
#include <lunaix/mm/vmm.h>
#include <lunaix/peripheral/ps2kbd.h>
#include <lunaix/proc.h>
#include <lunaix/mm/vmm.h>
#include <lunaix/peripheral/ps2kbd.h>
#include <lunaix/proc.h>
@@
-110,11
+112,14
@@
extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
void
init_platform()
{
void
init_platform()
{
- assert_msg(kalloc_init(), "Fail to initialize heap");
-
// 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射
lock_reserved_memory();
// 锁定所有系统预留页(内存映射IO,ACPI之类的),并且进行1:1映射
lock_reserved_memory();
+ cake_init();
+
+ assert_msg(kalloc_init(), "Fail to initialize heap");
+ valloc_init();
+
acpi_init(_k_init_mb_info);
apic_init();
ioapic_init();
acpi_init(_k_init_mb_info);
apic_init();
ioapic_init();
@@
-123,9
+128,10
@@
init_platform()
ps2_kbd_init();
pci_init();
ahci_init();
ps2_kbd_init();
pci_init();
ahci_init();
- pci_print_device();
ahci_list_device();
ahci_list_device();
+ cake_stats();
+
syscall_install();
console_start_flushing();
syscall_install();
console_start_flushing();