michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 23:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Avoid deadlocks in println/serial_println

Browse Source
This commit is contained in:
Philipp Oppermann
2018-10-20 16:44:40 +02:00
parent 68ffc3cd59
commit 66d940559f
4 changed files with 118 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vga_buffer.rs
View File

@@ -164,7 +164,11 @@ macro_rules! println {
/// Prints the given formatted string to the VGA text buffer through the global `WRITER` instance.
pub fn print(args: fmt::Arguments) {
use core::fmt::Write;
WRITER.lock().write_fmt(args).unwrap();
use x86_64::instructions::interrupts;
interrupts::without_interrupts(|| {
WRITER.lock().write_fmt(args).unwrap();
});
}
#[cfg(test)]