From 17b90a484ad1c84fd6f12bd2a2c1999766ab2dd6 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Sat, 4 Feb 2023 19:19:48 +0000 Subject: [PATCH] kernel: print version banner on boot --- arch/x86_64/init.c | 4 ++++ include/socks/init.h | 1 + init/main.c | 8 +++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/x86_64/init.c b/arch/x86_64/init.c index b16211d..687aae6 100644 --- a/arch/x86_64/init.c +++ b/arch/x86_64/init.c @@ -1,3 +1,4 @@ +#include #include #include @@ -13,5 +14,8 @@ int ml_init(uintptr_t arg) { bootstrap_cpu_init(); vgacon_init(); + + print_kernel_banner(); + return 0; } diff --git a/include/socks/init.h b/include/socks/init.h index d656321..21d30a0 100644 --- a/include/socks/init.h +++ b/include/socks/init.h @@ -27,6 +27,7 @@ typedef int (*initcall_t)(void); #define device_initcall(fn) __define_initcall(fn, __INITLEVEL_DEVICE) #define late_initcall(fn) __define_initcall(fn, __INITLEVEL_LATE) +extern void print_kernel_banner(void); extern int do_initcalls(void); #endif diff --git a/init/main.c b/init/main.c index 177ceec..7c9ef31 100644 --- a/init/main.c +++ b/init/main.c @@ -6,11 +6,13 @@ extern unsigned long get_rflags(void); +void print_kernel_banner(void) +{ + printk("Socks kernel version " BUILD_ID); +} + void kernel_init(uintptr_t arg) { ml_init(arg); - - printk("hello, world!"); - ml_halt_cpu(); }