Merge branch 'master' of https://github.com/redox-os/kernel

2018-05-24 08:31:59 -06:00
parent 764f28ada5 3f2bd559bf
commit 92ebd4d16a
1 changed files with 4 additions and 1 deletions
--- a/src/arch/x86_64/stop.rs
+++ b/src/arch/x86_64/stop.rs
@@ -14,7 +14,10 @@ pub unsafe extern fn kreset() -> ! {
        port.write(0xFE);
    }

-    // TODO: Use triple fault to guarantee reset
+    // Use triple fault to guarantee reset
+    asm!("cli" : : : : "intel", "volatile");
+    asm!("lidt cs:0" : : : : "intel", "volatile");
+    asm!("int $$3" : : : : "intel", "volatile");

    unreachable!();
 }