From 363217f3425f96766c67933ecd9bfc7453c5d66e Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 16 Jul 2017 09:40:04 +0200 Subject: move longjmp for kernel_panic --- src/kernel/kernel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index e107b8a..d708850 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -121,6 +121,12 @@ void kernel_main( void ) puts( "Initializing drivers" ); driver_manager_init( &global_context.driver_manager ); + // exit point in case of kernel panic, do this as soon as + // possible + if( setjmp( panic_jmp_buf ) > 0 ) { + goto TERMINATE; + } + // hard-wired drivers global_context.keyboard = (keyboard_t *)malloc( sizeof( keyboard_t ) ); @@ -132,12 +138,6 @@ void kernel_main( void ) mouse_set_resolution( global_context.mouse, global_context.vga_text.res_x, global_context.vga_text.res_y ); driver_manager_add_driver( &global_context.driver_manager, (driver_t *)global_context.mouse ); - // exit point in case of kernel panic, do this as soon as - // possible - if( setjmp( panic_jmp_buf ) > 0 ) { - goto TERMINATE; - } - // dynamically detected and registered drivers puts( "Detecting devices via PCI.." ); pci_controller_t pci_controller; -- cgit v1.2.3-54-g00ecf