michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #922 from phil-opp/post-12-fix

Browse Source 
The `enable_interrupts_and_hlt` function was renamed to `enable_and_hlt`
This commit is contained in:
Philipp Oppermann
2021-02-02 11:59:19 +01:00
committed by GitHub
parent 55a787f413 7ef188cda0
commit 5d8e8d6c02
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/task/executor.rs
View File

@@ -62,11 +62,11 @@ impl Executor {
}
fn sleep_if_idle(&self) {
use x86_64::instructions::interrupts::{self, enable_interrupts_and_hlt};
use x86_64::instructions::interrupts::{self, enable_and_hlt};
interrupts::disable();
if self.task_queue.is_empty() {
enable_interrupts_and_hlt();
enable_and_hlt();
} else {
interrupts::enable();
}