Skip to content

Commit e87443e

Browse files
authored
fix: align pub use with mainline code (#705)
1 parent b9939d6 commit e87443e

1 file changed

Lines changed: 20 additions & 11 deletions

File tree

ostd/src/mm/mod.rs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,29 @@ mod test;
2626

2727
use core::{fmt::Debug, ops::Range};
2828

29-
pub use self::io::{
30-
Fallible, FallibleVmRead, FallibleVmWrite, Infallible, PodOnce, VmIo, VmIoOnce, VmReader,
31-
VmWriter,
29+
pub use self::{
30+
dma::{Daddr, DmaCoherent, /* DmaDirection, DmaStream, DmaStreamSlice, */ HasDaddr},
31+
frame::{
32+
Frame,
33+
allocator::FrameAllocOptions,
34+
segment::{Segment, USegment},
35+
unique::UniqueFrame,
36+
untyped::{AnyUFrameMeta, UFrame, UntypedMem},
37+
},
38+
io::{
39+
Fallible, FallibleVmRead, FallibleVmWrite, Infallible, PodOnce, VmIo, VmIoOnce, VmReader,
40+
VmWriter,
41+
},
42+
page_prop::{CachePolicy, PageFlags, PageProperty},
43+
vm_space::VmSpace,
3244
};
33-
#[doc(hidden)]
34-
pub use crate::arch::mm::PagingConsts;
35-
36-
// Re-export paddr_to_vaddr from kspace
37-
#[doc(hidden)]
38-
pub use self::kspace::paddr_to_vaddr;
45+
pub(crate) use self::{
46+
kspace::paddr_to_vaddr, page_prop::PrivilegedPageFlags, page_table::PageTable,
47+
};
48+
pub(crate) use crate::arch::mm::PagingConsts;
3949

4050
// Re-export largest_pages from page_table
41-
#[doc(hidden)]
42-
pub use page_table::largest_pages;
51+
pub(crate) use page_table::largest_pages;
4352

4453
/// The level of a page table node or a frame.
4554
pub type PagingLevel = u8;

0 commit comments

Comments
 (0)