New elegant I/O blocking solution

This is done using an internal scheduler syscall (127).

Very nice!

14 files changed, 139 insertions, 126 deletions

diff --git a/kernel/drivers/interrupts.asm b/kernel/drivers/interrupts.asm
index 9f475fb..18cf007 100644
--- a/kernel/drivers/interrupts.asm
+++ b/kernel/drivers/interrupts.asm
@@ -106,6 +106,7 @@ ISR_NOERRCODE 28
 ISR_NOERRCODE 29
 ISR_NOERRCODE 30
 ISR_NOERRCODE 31
+ISR_NOERRCODE 127
 ISR_NOERRCODE 128
 
 extern isr_handler
diff --git a/kernel/drivers/interrupts.c b/kernel/drivers/interrupts.c
index 8ca6987..5b94b94 100644
--- a/kernel/drivers/interrupts.c
+++ b/kernel/drivers/interrupts.c
@@ -1,6 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 // TODO: Remove some magic numbers
 
+#include <assert.h>
 #include <cpu.h>
 #include <def.h>
 #include <interrupts.h>
@@ -21,13 +22,13 @@ PROTECTED static struct idt_ptr idt_ptr = { 0 };
 CLEAR void idt_set_gate(u8 num, u32 base, u16 sel, u8 flags)
 {
 	// Specify the interrupt routine's base address
-	idt[num].base_low = (u16)(base & 0xFFFF);
-	idt[num].base_high = (u16)((base >> 16) & 0xFFFF);
+	idt[num].base_low = (u16)(base & 0xffff);
+	idt[num].base_high = (u16)((base >> 16) & 0xffff);
 
 	// Set selector/segment of IDT entry
 	idt[num].sel = sel;
 	idt[num].always0 = 0;
-	idt[num].flags = (u8)(flags | 0x60);
+	idt[num].flags = flags;
 }
 
 // Install IDT
@@ -65,15 +66,15 @@ CLEAR void irq_uninstall_handler(int irq)
 CLEAR static void irq_remap(void)
 {
 	outb(0x20, 0x11);
-	outb(0xA0, 0x11);
+	outb(0xa0, 0x11);
 	outb(0x21, 0x20);
-	outb(0xA1, 0x28);
+	outb(0xa1, 0x28);
 	outb(0x21, 0x04);
-	outb(0xA1, 0x02);
+	outb(0xa1, 0x02);
 	outb(0x21, 0x01);
-	outb(0xA1, 0x01);
+	outb(0xa1, 0x01);
 	outb(0x21, 0x00);
-	outb(0xA1, 0x00);
+	outb(0xa1, 0x00);
 }
 
 // Handle IRQ ISRs
@@ -89,7 +90,7 @@ void irq_handler(struct regs *r)
 
 	// Send EOI to second (slave) PIC
 	if (r->int_no >= 40)
-		outb(0xA0, 0x20);
+		outb(0xa0, 0x20);
 
 	// Send EOI to master PIC
 	outb(0x20, 0x20);
@@ -100,23 +101,23 @@ CLEAR static void irq_install(void)
 {
 	irq_remap();
 
-	idt_set_gate(32, (u32)irq0, 0x08, 0x8E);
-	idt_set_gate(33, (u32)irq1, 0x08, 0x8E);
-	idt_set_gate(34, (u32)irq2, 0x08, 0x8E);
-	idt_set_gate(35, (u32)irq3, 0x08, 0x8E);
-	idt_set_gate(36, (u32)irq4, 0x08, 0x8E);
-	idt_set_gate(37, (u32)irq5, 0x08, 0x8E);
-	idt_set_gate(38, (u32)irq6, 0x08, 0x8E);
-	idt_set_gate(39, (u32)irq7, 0x08, 0x8E);
-
-	idt_set_gate(40, (u32)irq8, 0x08, 0x8E);
-	idt_set_gate(41, (u32)irq9, 0x08, 0x8E);
-	idt_set_gate(42, (u32)irq10, 0x08, 0x8E);
-	idt_set_gate(43, (u32)irq11, 0x08, 0x8E);
-	idt_set_gate(44, (u32)irq12, 0x08, 0x8E);
-	idt_set_gate(45, (u32)irq13, 0x08, 0x8E);
-	idt_set_gate(46, (u32)irq14, 0x08, 0x8E);
-	idt_set_gate(47, (u32)irq15, 0x08, 0x8E);
+	idt_set_gate(32, (u32)irq0, 0x08, 0x8e);
+	idt_set_gate(33, (u32)irq1, 0x08, 0x8e);
+	idt_set_gate(34, (u32)irq2, 0x08, 0x8e);
+	idt_set_gate(35, (u32)irq3, 0x08, 0x8e);
+	idt_set_gate(36, (u32)irq4, 0x08, 0x8e);
+	idt_set_gate(37, (u32)irq5, 0x08, 0x8e);
+	idt_set_gate(38, (u32)irq6, 0x08, 0x8e);
+	idt_set_gate(39, (u32)irq7, 0x08, 0x8e);
+
+	idt_set_gate(40, (u32)irq8, 0x08, 0x8e);
+	idt_set_gate(41, (u32)irq9, 0x08, 0x8e);
+	idt_set_gate(42, (u32)irq10, 0x08, 0x8e);
+	idt_set_gate(43, (u32)irq11, 0x08, 0x8e);
+	idt_set_gate(44, (u32)irq12, 0x08, 0x8e);
+	idt_set_gate(45, (u32)irq13, 0x08, 0x8e);
+	idt_set_gate(46, (u32)irq14, 0x08, 0x8e);
+	idt_set_gate(47, (u32)irq15, 0x08, 0x8e);
 }
 
 /**
@@ -187,12 +188,14 @@ void isr_panic(struct regs *r)
 	} else {
 		__asm__ volatile("cli\nhlt");
 	}
-	proc_yield(r);
+	proc_yield();
 }
 
 void isr_handler(struct regs *r);
 void isr_handler(struct regs *r)
 {
+	assert(r->int_no < sizeof(isr_routines));
+
 	// Execute fault handler if exists
 	void (*handler)(struct regs * r) = isr_routines[r->int_no];
 	if (handler)
@@ -203,41 +206,41 @@ void isr_handler(struct regs *r)
 
 CLEAR static void isr_install(void)
 {
-	idt_set_gate(0, (u32)isr0, 0x08, 0x8E);
-	idt_set_gate(1, (u32)isr1, 0x08, 0x8E);
-	idt_set_gate(2, (u32)isr2, 0x08, 0x8E);
-	idt_set_gate(3, (u32)isr3, 0x08, 0x8E);
-	idt_set_gate(4, (u32)isr4, 0x08, 0x8E);
-	idt_set_gate(5, (u32)isr5, 0x08, 0x8E);
-	idt_set_gate(6, (u32)isr6, 0x08, 0x8E);
-	idt_set_gate(7, (u32)isr7, 0x08, 0x8E);
-
-	idt_set_gate(8, (u32)isr8, 0x08, 0x8E);
-	idt_set_gate(9, (u32)isr9, 0x08, 0x8E);
-	idt_set_gate(10, (u32)isr10, 0x08, 0x8E);
-	idt_set_gate(11, (u32)isr11, 0x08, 0x8E);
-	idt_set_gate(12, (u32)isr12, 0x08, 0x8E);
-	idt_set_gate(13, (u32)isr13, 0x08, 0x8E);
-	idt_set_gate(14, (u32)isr14, 0x08, 0x8E);
-	idt_set_gate(15, (u32)isr15, 0x08, 0x8E);
-
-	idt_set_gate(16, (u32)isr16, 0x08, 0x8E);
-	idt_set_gate(17, (u32)isr17, 0x08, 0x8E);
-	idt_set_gate(18, (u32)isr18, 0x08, 0x8E);
-	idt_set_gate(19, (u32)isr19, 0x08, 0x8E);
-	idt_set_gate(20, (u32)isr20, 0x08, 0x8E);
-	idt_set_gate(21, (u32)isr21, 0x08, 0x8E);
-	idt_set_gate(22, (u32)isr22, 0x08, 0x8E);
-	idt_set_gate(23, (u32)isr23, 0x08, 0x8E);
-
-	idt_set_gate(24, (u32)isr24, 0x08, 0x8E);
-	idt_set_gate(25, (u32)isr25, 0x08, 0x8E);
-	idt_set_gate(26, (u32)isr26, 0x08, 0x8E);
-	idt_set_gate(27, (u32)isr27, 0x08, 0x8E);
-	idt_set_gate(28, (u32)isr28, 0x08, 0x8E);
-	idt_set_gate(29, (u32)isr29, 0x08, 0x8E);
-	idt_set_gate(30, (u32)isr30, 0x08, 0x8E);
-	idt_set_gate(31, (u32)isr31, 0x08, 0x8E);
+	idt_set_gate(0, (u32)isr0, 0x08, 0x8e);
+	idt_set_gate(1, (u32)isr1, 0x08, 0x8e);
+	idt_set_gate(2, (u32)isr2, 0x08, 0x8e);
+	idt_set_gate(3, (u32)isr3, 0x08, 0x8e);
+	idt_set_gate(4, (u32)isr4, 0x08, 0x8e);
+	idt_set_gate(5, (u32)isr5, 0x08, 0x8e);
+	idt_set_gate(6, (u32)isr6, 0x08, 0x8e);
+	idt_set_gate(7, (u32)isr7, 0x08, 0x8e);
+
+	idt_set_gate(8, (u32)isr8, 0x08, 0x8e);
+	idt_set_gate(9, (u32)isr9, 0x08, 0x8e);
+	idt_set_gate(10, (u32)isr10, 0x08, 0x8e);
+	idt_set_gate(11, (u32)isr11, 0x08, 0x8e);
+	idt_set_gate(12, (u32)isr12, 0x08, 0x8e);
+	idt_set_gate(13, (u32)isr13, 0x08, 0x8e);
+	idt_set_gate(14, (u32)isr14, 0x08, 0x8e);
+	idt_set_gate(15, (u32)isr15, 0x08, 0x8e);
+
+	idt_set_gate(16, (u32)isr16, 0x08, 0x8e);
+	idt_set_gate(17, (u32)isr17, 0x08, 0x8e);
+	idt_set_gate(18, (u32)isr18, 0x08, 0x8e);
+	idt_set_gate(19, (u32)isr19, 0x08, 0x8e);
+	idt_set_gate(20, (u32)isr20, 0x08, 0x8e);
+	idt_set_gate(21, (u32)isr21, 0x08, 0x8e);
+	idt_set_gate(22, (u32)isr22, 0x08, 0x8e);
+	idt_set_gate(23, (u32)isr23, 0x08, 0x8e);
+
+	idt_set_gate(24, (u32)isr24, 0x08, 0x8e);
+	idt_set_gate(25, (u32)isr25, 0x08, 0x8e);
+	idt_set_gate(26, (u32)isr26, 0x08, 0x8e);
+	idt_set_gate(27, (u32)isr27, 0x08, 0x8e);
+	idt_set_gate(28, (u32)isr28, 0x08, 0x8e);
+	idt_set_gate(29, (u32)isr29, 0x08, 0x8e);
+	idt_set_gate(30, (u32)isr30, 0x08, 0x8e);
+	idt_set_gate(31, (u32)isr31, 0x08, 0x8e);
 
 	// Set default routines
 	for (u32 i = 0; i < 256; i++)
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index c3d5402..34c70e8 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -198,28 +198,6 @@ res vfs_write(const char *path, void *buf, u32 offset, u32 count)
 	return m->dev->vfs->write(path, buf, offset, count, m->dev);
 }
 
-res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3)
-{
-	if (!memory_readable(path))
-		return -EFAULT;
-
-	struct mount_info *m = vfs_find_mount_info(path);
-	if (!m || !m->dev || !m->dev->vfs)
-		return -ENOENT;
-
-	if (!m->dev->vfs->ioctl || !m->dev->vfs->perm)
-		return -EINVAL;
-
-	u32 len = strlen(m->path);
-	if (len > 1)
-		path += len;
-
-	if (m->dev->vfs->perm(path, VFS_WRITE, m->dev) != EOK && !proc_super())
-		return -EACCES;
-
-	return m->dev->vfs->ioctl(path, request, arg1, arg2, arg3, m->dev);
-}
-
 res vfs_stat(const char *path, struct stat *buf)
 {
 	if (!memory_readable(path))
diff --git a/kernel/features/io.c b/kernel/features/io.c
index 6042818..d0f1b1c 100644
--- a/kernel/features/io.c
+++ b/kernel/features/io.c
@@ -11,6 +11,7 @@
 #include <ps2.h>
 #include <rand.h>
 #include <str.h>
+#include <syscall.h>
 #include <timer.h>
 
 PROTECTED static struct io_dev *io_mappings[IO_MAX] = { 0 };
@@ -40,6 +41,7 @@ res io_poll(u32 *devs)
 	if (!memory_readable(devs))
 		return -EFAULT;
 
+	io_block(IO_BUS, proc_current()); // TODO!
 	for (u32 *p = devs; p && memory_readable(p) && *p; p++) {
 		if (!io_get(*p))
 			return -ENOENT;
@@ -84,30 +86,32 @@ res io_read(enum io_type io, void *buf, u32 offset, u32 count)
 	return dev->read(buf, offset, count);
 }
 
-void io_block(enum io_type io, struct proc *proc, struct regs *r)
+res io_ready(enum io_type io)
+{
+	struct io_dev *dev;
+	if (!(dev = io_get(io)))
+		return -ENOENT;
+
+	if (dev->ready && !dev->ready())
+		return -EAGAIN;
+
+	return EOK;
+}
+
+void io_block(enum io_type io, struct proc *proc)
 {
-	assert(r->eax == SYS_IOREAD);
 	assert(io_type_valid(io));
 	list_add(io_listeners[io], proc);
 	proc_state(proc_current(), PROC_BLOCKED);
-	proc_yield(r);
+	proc_yield();
 }
 
 void io_unblock(enum io_type io)
 {
-	struct page_dir *dir_bak;
-	memory_backup_dir(&dir_bak);
-
 	assert(io_type_valid(io));
 	struct node *iterator = io_listeners[io]->head;
 	while (iterator) {
 		struct proc *proc = iterator->data;
-		struct regs *r = &proc->regs;
-
-		memory_switch_dir(proc->page_dir);
-		r->eax = io_read(r->ebx, (void *)r->ecx, r->edx, r->esi);
-		memory_switch_dir(dir_bak);
-
 		proc_state(proc, PROC_RUNNING);
 		struct node *next = iterator->next;
 		list_remove(io_listeners[io], iterator);
diff --git a/kernel/features/mm.c b/kernel/features/mm.c
index d9e4577..9f0bd07 100644
--- a/kernel/features/mm.c
+++ b/kernel/features/mm.c
@@ -602,11 +602,17 @@ void memory_bypass_disable(void)
 
 u8 memory_is_user(const void *addr)
 {
+	if (!addr)
+		return 0;
+
 	return PDI((u32)addr) >= PAGE_KERNEL_COUNT;
 }
 
 u8 memory_readable(const void *addr)
 {
+	if (!addr)
+		return 0;
+
 	struct proc *proc = proc_current();
 	if (proc && !memory_bypass_validity)
 		return memory_is_user(addr) && virtual_user_readable(proc->page_dir, (u32)addr);
@@ -616,6 +622,9 @@ u8 memory_readable(const void *addr)
 
 u8 memory_writable(const void *addr)
 {
+	if (!addr)
+		return 0;
+
 	struct proc *proc = proc_current();
 	if (proc && !memory_bypass_validity)
 		return memory_is_user(addr) && virtual_user_writable(proc->page_dir, (u32)addr);
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 6ddeb32..c972f1b 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -177,13 +177,13 @@ void proc_exit(struct proc *proc, struct regs *r, s32 status)
 
 	free(proc);
 
-	proc_yield(r);
+	proc_yield();
 }
 
-void proc_yield(struct regs *r)
+void proc_yield(void)
 {
 	proc_reset_quantum(PROC(current));
-	scheduler(r);
+	__asm__ volatile("int $127");
 }
 
 struct proc *proc_make(enum proc_priv priv)
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 2c30a3b..94ea778 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -19,7 +19,6 @@
 static void syscall_handler(struct regs *r)
 {
 	enum sys num = r->eax;
-	r->eax = EOK;
 
 	/* printf("[SYSCALL] %d from %s\n", num, proc_current()->name); */
 
@@ -56,16 +55,18 @@ static void syscall_handler(struct regs *r)
 
 	// I/O operations
 	case SYS_IOPOLL: {
-		r->eax = io_poll((u32 *)r->ebx);
+		r->eax = io_poll((void *)r->ebx);
 		break;
 	}
 	case SYS_IOREAD: {
-		res ret = io_read(r->ebx, (void *)r->ecx, r->edx, r->esi);
-		if (ret == -EAGAIN) {
-			io_block(r->ebx, proc_current(), r);
-		} else {
-			r->eax = ret;
+		res ready = io_ready(r->ebx);
+		if (ready == -EAGAIN) {
+			io_block(r->ebx, proc_current());
+		} else if (ready != EOK) {
+			r->eax = ready;
+			break;
 		}
+		r->eax = io_read(r->ebx, (void *)r->ecx, r->edx, r->esi);
 		break;
 	}
 	case SYS_IOWRITE: {
@@ -87,7 +88,7 @@ static void syscall_handler(struct regs *r)
 		} else {
 			// TODO: Reimplement argc,argv
 			proc_stack_push(proc, 0);
-			proc_yield(r);
+			proc_yield();
 		}
 		break;
 	}
@@ -98,7 +99,7 @@ static void syscall_handler(struct regs *r)
 	}
 	case SYS_YIELD: {
 		r->eax = EOK;
-		proc_yield(r);
+		proc_yield();
 		break;
 	}
 
@@ -140,8 +141,19 @@ static void syscall_handler(struct regs *r)
 	}
 }
 
+// For kernel syscalls (internal)
+static void syscall_special_handler(struct regs *r)
+{
+	if (RING(r) != 0)
+		return;
+
+	scheduler(r);
+}
+
 CLEAR void syscall_init(void)
 {
-	idt_set_gate(0x80, (u32)isr128, 0x08, 0x8E);
+	idt_set_gate(0x7f, (u32)isr127, 0x08, 0x8e);
+	idt_set_gate(0x80, (u32)isr128, 0x08, 0xee);
+	isr_install_handler(0x7f, syscall_special_handler);
 	isr_install_handler(0x80, syscall_handler);
 }
diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h
index 93a8a5c..8dbf028 100644
--- a/kernel/inc/fs.h
+++ b/kernel/inc/fs.h
@@ -60,10 +60,10 @@ res vfs_mount(struct vfs_dev *dev, const char *path) NONNULL;
 struct vfs_dev *vfs_find_dev(const char *path) NONNULL;
 void vfs_add_dev(struct vfs_dev *dev) NONNULL;
 
-res vfs_read(const char *path, void *buf, u32 offset, u32 count) NONNULL;
-res vfs_write(const char *path, void *buf, u32 offset, u32 count) NONNULL;
-res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) ATTR((nonnull(1)));
-res vfs_stat(const char *path, struct stat *buf) NONNULL;
+// No NONNULL on syscalls
+res vfs_read(const char *path, void *buf, u32 offset, u32 count);
+res vfs_write(const char *path, void *buf, u32 offset, u32 count);
+res vfs_stat(const char *path, struct stat *buf);
 
 struct vfs_dev *device_get_by_name(const char *name) NONNULL;
 struct vfs_dev *device_get_by_id(u32 id) NONNULL;
diff --git a/kernel/inc/interrupts.h b/kernel/inc/interrupts.h
index a22bebb..7c0c1e7 100644
--- a/kernel/inc/interrupts.h
+++ b/kernel/inc/interrupts.h
@@ -70,6 +70,7 @@ extern void isr28(struct regs *r);
 extern void isr29(struct regs *r);
 extern void isr30(struct regs *r);
 extern void isr31(struct regs *r);
+extern void isr127(struct regs *r);
 extern void isr128(struct regs *r);
 
 extern void irq0(struct regs *r);
@@ -88,6 +89,7 @@ extern void irq12(struct regs *r);
 extern void irq13(struct regs *r);
 extern void irq14(struct regs *r);
 extern void irq15(struct regs *r);
+extern void irq127(struct regs *r);
 extern void irq128(struct regs *r);
 
 #endif
diff --git a/kernel/inc/io.h b/kernel/inc/io.h
index 3291bfc..e0b817b 100644
--- a/kernel/inc/io.h
+++ b/kernel/inc/io.h
@@ -19,12 +19,14 @@ struct io_dev {
 void io_install(struct boot_info *boot);
 void io_add(enum io_type io, struct io_dev *dev) NONNULL;
 
+// No NONNULL on syscalls
 res io_control(enum io_type io, u32 request, void *arg1, void *arg2, void *arg3);
 res io_write(enum io_type io, void *buf, u32 offset, u32 count);
 res io_read(enum io_type io, void *buf, u32 offset, u32 count);
-res io_poll(u32 *devs) NONNULL;
+res io_poll(u32 *devs);
+res io_ready(enum io_type io);
 
-void io_block(enum io_type io, struct proc *proc, struct regs *r) NONNULL;
+void io_block(enum io_type io, struct proc *proc) NONNULL;
 void io_unblock(enum io_type io);
 
 #endif
diff --git a/kernel/inc/load.h b/kernel/inc/load.h
index 9e62369..740e13a 100644
--- a/kernel/inc/load.h
+++ b/kernel/inc/load.h
@@ -161,6 +161,7 @@ struct PACKED elf_symbol {
 	u16 shndx;
 };
 
-res elf_load(const char *name, struct proc *proc) NONNULL;
+// No NONNULL on syscalls
+res elf_load(const char *name, struct proc *proc);
 
 #endif
diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h
index 0f1b4ec..dc28a8d 100644
--- a/kernel/inc/mm.h
+++ b/kernel/inc/mm.h
@@ -132,14 +132,16 @@ void memory_backup_dir(struct page_dir **backup) NONNULL;
 // Bypass should almost never be used
 void memory_bypass_enable(void);
 void memory_bypass_disable(void);
-u8 memory_is_user(const void *addr) NONNULL;
-u8 memory_readable(const void *addr) NONNULL;
-u8 memory_writable(const void *addr) NONNULL;
-
-// User interface
-res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared) NONNULL;
-res memory_sys_free(struct page_dir *dir, u32 addr) NONNULL;
-res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size) NONNULL;
+
+// No NONNULL on verification (for syscalls etc)
+u8 memory_is_user(const void *addr);
+u8 memory_readable(const void *addr);
+u8 memory_writable(const void *addr);
+
+// User interface - No NONNULL on syscalls
+res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared);
+res memory_sys_free(struct page_dir *dir, u32 addr);
+res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size);
 
 void memory_user_hook(void);
 void memory_install(struct boot_info *boot) NONNULL;
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index 754693f..1d5d064 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -71,7 +71,7 @@ struct proc *proc_current(void);
 u8 proc_super(void);
 struct proc *proc_from_pid(u32 pid);
 void proc_exit(struct proc *proc, struct regs *r, s32 status) NONNULL;
-void proc_yield(struct regs *r) NONNULL;
+void proc_yield(void);
 void proc_set_quantum(struct proc *proc, u32 value);
 void proc_reset_quantum(struct proc *proc);
 void proc_state(struct proc *proc, enum proc_state state);
diff --git a/kernel/main.c b/kernel/main.c
index 6cbc297..e558126 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -53,7 +53,6 @@ int kernel_main(struct boot_info *boot)
 	sti();
 
 	syscall_init();
-
 	proc_init();
 
 	return 1;