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

Update x86 crate to version 0.8.0 (#266)

Browse Source 
(cherry picked from commit 02697891e2)
This commit is contained in:
Philipp Oppermann
2016-12-21 14:59:57 +01:00
parent d5c84a860a
commit 94d4f8df8e
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib.rs
View File

@@ -62,7 +62,7 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) {
}
fn enable_nxe_bit() {
use x86::msr::{IA32_EFER, rdmsr, wrmsr};
use x86::shared::msr::{IA32_EFER, rdmsr, wrmsr};
let nxe_bit = 1 << 11;
unsafe {
@@ -72,10 +72,9 @@ fn enable_nxe_bit() {
}
fn enable_write_protect_bit() {
use x86::controlregs::{cr0, cr0_write};
use x86::shared::control_regs::{cr0, cr0_write, CR0_WRITE_PROTECT};
let wp_bit = 1 << 16;
unsafe { cr0_write(cr0() | wp_bit) };
unsafe { cr0_write(cr0() | CR0_WRITE_PROTECT) };
}
#[cfg(not(test))]