aboutsummaryrefslogtreecommitdiff
path: root/kernel/l0/kmain.c
diff options
context:
space:
mode:
authorAlex Auvolat <alex.auvolat@ens.fr>2014-12-06 23:15:06 +0100
committerAlex Auvolat <alex.auvolat@ens.fr>2014-12-06 23:15:06 +0100
commitacc786cb5805d057932ada3e7c571bb8e901cd67 (patch)
treefe6a9da99a9c5492f1004363a2a1a7aa8bfc8fed /kernel/l0/kmain.c
parent0b5d6568c468075b6c1a2de065332b270345611b (diff)
downloadkogata-acc786cb5805d057932ada3e7c571bb8e901cd67.tar.gz
kogata-acc786cb5805d057932ada3e7c571bb8e901cd67.zip
Begin review of taking model : making things thread safe.
Diffstat (limited to 'kernel/l0/kmain.c')
-rw-r--r--kernel/l0/kmain.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/l0/kmain.c b/kernel/l0/kmain.c
index 63ed6ac..5d85fe5 100644
--- a/kernel/l0/kmain.c
+++ b/kernel/l0/kmain.c
@@ -24,6 +24,11 @@ void* page_alloc_fun_for_kmalloc(size_t bytes) {
return addr;
}
+void yield() {
+ // multitasking not implemented yet
+ dbg_printf("Warning : probable deadlock?\n");
+}
+
slab_type_t slab_sizes[] = {
{ "8B obj", 8, 2 },
{ "16B obj", 16, 2 },
@@ -51,7 +56,7 @@ void kmain(struct multiboot_info_t *mbd, int32_t mb_magic) {
idt_init(); dbg_printf("IDT set up.\n");
idt_set_ex_handler(EX_BREAKPOINT, breakpoint_handler);
- // asm volatile("int $0x3"); // test breakpoint
+ asm volatile("int $0x3"); // test breakpoint
size_t total_ram = ((mbd->mem_upper + mbd->mem_lower) * 1024);
dbg_printf("Total ram: %d Kb\n", total_ram / 1024);