diff --git a/build.rs b/build.rs index acc24d2292ebdca53b054ebd4b702f1e244845a9..3c6cb468cc906a94458069097d69200a3d0f8f83 100644 --- a/build.rs +++ b/build.rs @@ -45,7 +45,7 @@ fn scan_folder(loc: &Path) -> (HashMap<String, Vec<String>>, Vec<String>) { } // Write folder/file information to output file -fn fill_from_location(f: &mut fs::File, loc: &Path ) -> Result<(), (Error)> { +fn fill_from_location(f: &mut fs::File, loc: &Path ) -> Result<(), Error> { let (folders, mut files) = scan_folder(loc); let mut folder_it:Vec<_> = folders.keys().collect(); diff --git a/src/arch/x86_64/paging/mod.rs b/src/arch/x86_64/paging/mod.rs index 2b4cce240684c4a1369c3d4795de222e964eaefe..70b8ff96bb54375a71f6c21570ab4a24b015ca87 100644 --- a/src/arch/x86_64/paging/mod.rs +++ b/src/arch/x86_64/paging/mod.rs @@ -45,9 +45,7 @@ fn page_table_lock() { return; } } - unsafe { crate::arch::interrupt::pause(); - } } }