From c3f76cf1f061dbf2ba9d6bffd4eaf87e3f472dd5 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 22 Nov 2019 16:06:56 +0100 Subject: [PATCH 1/2] Use panic instead of println + hlt_loop for double fault handler --- src/interrupts.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/interrupts.rs b/src/interrupts.rs index d6ccf826..10fbc21f 100644 --- a/src/interrupts.rs +++ b/src/interrupts.rs @@ -60,8 +60,7 @@ extern "x86-interrupt" fn double_fault_handler( stack_frame: &mut InterruptStackFrame, _error_code: u64, ) { - println!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame); - hlt_loop(); + panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame); } extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) { From b5b37d6e2b377bedeec8d61db0f09d40ec11aa97 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 22 Nov 2019 16:12:28 +0100 Subject: [PATCH 2/2] Remove unused `crate::hlt_loop` import --- src/interrupts.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interrupts.rs b/src/interrupts.rs index 10fbc21f..48b9c83c 100644 --- a/src/interrupts.rs +++ b/src/interrupts.rs @@ -4,7 +4,7 @@ // problem we skip compilation of this module on Windows. #![cfg(not(windows))] -use crate::{gdt, hlt_loop, print, println}; +use crate::{gdt, print, println}; use lazy_static::lazy_static; use pic8259_simple::ChainedPics; use spin;