diff --git a/framework/jinux-frame/src/arch/x86/boot/mod.rs b/framework/jinux-frame/src/arch/x86/boot/mod.rs index 65a887bbf..28cdb7161 100644 --- a/framework/jinux-frame/src/arch/x86/boot/mod.rs +++ b/framework/jinux-frame/src/arch/x86/boot/mod.rs @@ -14,7 +14,7 @@ pub mod multiboot2; use self::multiboot2::*; pub mod memory_region; -pub use memory_region::*; +use self::memory_region::MemoryRegion; use alloc::{string::String, vec::Vec}; use spin::Once; diff --git a/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs b/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs index 74d12105d..8506be746 100644 --- a/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs +++ b/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs @@ -2,8 +2,9 @@ use alloc::{string::ToString, vec::Vec}; use multiboot2::{BootInformation, BootInformationHeader, MemoryAreaType}; use super::{ - BootloaderAcpiArg, BootloaderFramebufferArg, MemoryRegion, MemoryRegionType, ACPI_RSDP, - BOOTLOADER_NAME, FRAMEBUFFER_INFO, INITRAMFS, KERNEL_COMMANDLINE, MEMORY_REGIONS, + memory_region::{MemoryRegion, MemoryRegionType}, + BootloaderAcpiArg, BootloaderFramebufferArg, ACPI_RSDP, BOOTLOADER_NAME, FRAMEBUFFER_INFO, + INITRAMFS, KERNEL_COMMANDLINE, MEMORY_REGIONS, }; use core::{arch::global_asm, mem::swap}; use spin::Once; diff --git a/framework/jinux-frame/src/vm/frame_allocator.rs b/framework/jinux-frame/src/vm/frame_allocator.rs index b135062cd..83b6ab29b 100644 --- a/framework/jinux-frame/src/vm/frame_allocator.rs +++ b/framework/jinux-frame/src/vm/frame_allocator.rs @@ -3,7 +3,7 @@ use buddy_system_allocator::FrameAllocator; use log::info; use spin::Once; -use crate::arch::boot::{MemoryRegion, MemoryRegionType}; +use crate::arch::boot::memory_region::{MemoryRegion, MemoryRegionType}; use crate::{config::PAGE_SIZE, sync::SpinLock}; use super::{frame::VmFrameFlags, VmFrame}; diff --git a/framework/jinux-frame/src/vm/mod.rs b/framework/jinux-frame/src/vm/mod.rs index e44e1357c..c5f957d7b 100644 --- a/framework/jinux-frame/src/vm/mod.rs +++ b/framework/jinux-frame/src/vm/mod.rs @@ -29,7 +29,7 @@ pub use self::{ use alloc::vec::Vec; use spin::Once; -use crate::arch::boot::{MemoryRegion, MemoryRegionType}; +use crate::arch::boot::memory_region::{MemoryRegion, MemoryRegionType}; /// Convert physical address to virtual address using offset, only available inside jinux-frame pub(crate) fn paddr_to_vaddr(pa: usize) -> usize {