From b82f596ef63e4e8cc11a9f532193073c8040931a Mon Sep 17 00:00:00 2001 From: Skallwar <estblcsk@gmail.com> Date: Fri, 6 Mar 2020 21:02:20 +0100 Subject: [PATCH] Fix unnecessary syntax --- build.rs | 2 +- src/arch/x86_64/paging/mod.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build.rs b/build.rs index acc24d22..3c6cb468 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 2b4cce24..70b8ff96 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(); - } } } -- GitLab