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
fix: add dummy process to keep scheduler busy
[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 32164c88aa832cafad68c919068cf2dbe227d679..d1643b42a71c391f545729f75c78e42273bffa36 100644
(file)
--- a/
lunaix-os/kernel/k_init.c
+++ b/
lunaix-os/kernel/k_init.c
@@
-33,8
+33,6
@@
multiboot_info_t* _k_init_mb_info;
x86_page_table* __kernel_ptd;
x86_page_table* __kernel_ptd;
-struct proc_info tmp;
-
extern void
__proc0(); /* proc0.c */
extern void
__proc0(); /* proc0.c */
@@
-60,12
+58,6
@@
_kernel_pre_init()
_k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);
_k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
setup_memory((multiboot_memory_map_t*)_k_init_mb_info->mmap_addr, map_size);
-
- __kernel_ptd = cpu_rcr3();
-
- tmp = (struct proc_info){ .page_table = __kernel_ptd };
-
- __current = &tmp;
}
void
}
void
@@
-77,6
+69,8
@@
_kernel_init()
cake_init();
valloc_init();
cake_init();
valloc_init();
+ sched_init();
+
// crt
tty_init(ioremap(VGA_FRAMEBUFFER, PG_SIZE));
tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
// crt
tty_init(ioremap(VGA_FRAMEBUFFER, PG_SIZE));
tty_set_theme(VGA_COLOR_WHITE, VGA_COLOR_BLACK);
@@
-98,8
+92,6
@@
_kernel_init()
lxconsole_init();
lxconsole_init();
- sched_init();
-
syscall_install();
spawn_proc0();
syscall_install();
spawn_proc0();