init -> kernel_init

3 years ago · 14e5cd804a
parent a3516b9ded
commit 14e5cd804a
2 changed files with 3 additions and 3 deletions
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@ -1,6 +1,6 @@
 #include "kernel.h"
-void init() {
+void kernel_init() {
 	vga_init(); 	// Initialize the screen first
 			// i.e. clear the screen et cetera.
--- a/kernel/kernel_entry.asm
+++ b/kernel/kernel_entry.asm
@ -1,8 +1,8 @@
 [bits 32]
-[extern init]
+[extern kernel_init]
 multiboot2:
 	dw 0xE85250D6
-call init 
+call kernel_init 
 jmp $