Skip to content

Commit

Permalink
fix: cargo doc
Browse files Browse the repository at this point in the history
  • Loading branch information
llenotre committed Oct 20, 2024
1 parent eac5d39 commit e1a1d64
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
7 changes: 4 additions & 3 deletions kernel/src/arch/x86/paging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ pub fn translate(page_dir: &Table, addr: VirtAddr) -> Option<PhysAddr> {
Some(PhysAddr(phys_addr))
}

/// Inner version of [`super::Rollback`] for x86.
/// Memory paging rollback hook, allowing to undo modifications on a virtual memory context if an
/// operation in a transaction fails, allowing to preserve integrity.
pub struct Rollback {
/// The list of modified entries, with their respective previous value and a boolean
/// indicating whether the underlying table could be freed.
Expand Down Expand Up @@ -358,7 +359,7 @@ impl Drop for Rollback {
}
}

/// Inner implementation of [`super::VMem::map`] for x86.
/// Inner implementation of [`crate::memory::vmem::VMemTransaction::map`] for x86.
///
/// # Safety
///
Expand Down Expand Up @@ -412,7 +413,7 @@ pub unsafe fn map(
})
}

/// Inner implementation of [`super::VMem::unmap`] for x86.
/// Inner implementation of [`crate::memory::vmem::VMemTransaction::unmap`] for x86.
///
/// # Safety
///
Expand Down
3 changes: 1 addition & 2 deletions kernel/src/boot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
*/

use crate::{
arch::{x86, x86::gdt},
arch::x86::{gdt, paging::Table},
memory::VirtAddr,
};
use core::arch::global_asm;
use crate::arch::x86::paging::Table;

#[cfg(target_arch = "x86")]
pub const GDT_VIRT_ADDR: VirtAddr = VirtAddr(0xc0000800);
Expand Down

0 comments on commit e1a1d64

Please sign in to comment.