From 8e5b6a3e3f6642a59f2ac77cffe61612c94065ce Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sat, 9 Mar 2019 12:34:49 +0100 Subject: [PATCH] Update post-07 code for changes in x86_64 0.5.0 --- src/bin/test-exception-double-fault-stack-overflow.rs | 2 +- src/interrupts.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/test-exception-double-fault-stack-overflow.rs b/src/bin/test-exception-double-fault-stack-overflow.rs index 3d934a4c..fa5a227f 100644 --- a/src/bin/test-exception-double-fault-stack-overflow.rs +++ b/src/bin/test-exception-double-fault-stack-overflow.rs @@ -45,7 +45,7 @@ fn panic(info: &PanicInfo) -> ! { loop {} } -use x86_64::structures::idt::{ExceptionStackFrame, InterruptDescriptorTable}; +use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame}; lazy_static! { static ref TEST_IDT: InterruptDescriptorTable = { diff --git a/src/interrupts.rs b/src/interrupts.rs index 831a9c76..b0223110 100644 --- a/src/interrupts.rs +++ b/src/interrupts.rs @@ -30,7 +30,7 @@ extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFra } extern "x86-interrupt" fn double_fault_handler( - stack_frame: &mut ExceptionStackFrame, + stack_frame: &mut InterruptStackFrame, _error_code: u64, ) { println!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);