From ef1166f6e83d72df360a6dfc2f6643d826ce07ba Mon Sep 17 00:00:00 2001 From: Ada Christine Date: Mon, 12 Apr 2021 15:10:16 +0000 Subject: panic() and halt() now in kernel private interface --- kernel/entry_efi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'kernel/entry_efi.c') diff --git a/kernel/entry_efi.c b/kernel/entry_efi.c index 7d8e058..f4eeb9c 100644 --- a/kernel/entry_efi.c +++ b/kernel/entry_efi.c @@ -10,8 +10,7 @@ #include "serial.h" #include "kprint.h" #include "memory.h" - -static noreturn void hang(void); +#include "panic.h" static void efi_memory_init(struct efi_memory_map_data *map) { @@ -65,12 +64,5 @@ noreturn void kernel_entry(struct efi_boot_data *data) serial_init(); kputs(" i'm in\r\n"); efi_memory_init(data->memory_map); - hang(); + halt(); } - -static noreturn void hang(void) -{ - __asm__ ("cli\n\t"); - while (true) __asm__ ("hlt\n\t"); -} - -- cgit v1.3.1-1-g115d