Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-28 20:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory region glob re-export

Browse Source
This commit is contained in:
Zhang Junyang
2023-07-24 15:23:17 +08:00
committed by Tate, Hongliang Tian
parent e3adb6e482
commit 5012779e38
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/jinux-frame/src/arch/x86/boot/mod.rs
View File

@ -14,7 +14,7 @@ pub mod multiboot2;
use self::multiboot2::*; use self::multiboot2::*;
pub mod memory_region; pub mod memory_region;
pub use memory_region::*; use self::memory_region::MemoryRegion;
use alloc::{string::String, vec::Vec}; use alloc::{string::String, vec::Vec};
use spin::Once; use spin::Once;

5
framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs
View File

@ -2,8 +2,9 @@ use alloc::{string::ToString, vec::Vec};
use multiboot2::{BootInformation, BootInformationHeader, MemoryAreaType}; use multiboot2::{BootInformation, BootInformationHeader, MemoryAreaType};
use super::{ use super::{
BootloaderAcpiArg, BootloaderFramebufferArg, MemoryRegion, MemoryRegionType, ACPI_RSDP, memory_region::{MemoryRegion, MemoryRegionType},
BOOTLOADER_NAME, FRAMEBUFFER_INFO, INITRAMFS, KERNEL_COMMANDLINE, MEMORY_REGIONS, BootloaderAcpiArg, BootloaderFramebufferArg, ACPI_RSDP, BOOTLOADER_NAME, FRAMEBUFFER_INFO,
INITRAMFS, KERNEL_COMMANDLINE, MEMORY_REGIONS,
}; };
use core::{arch::global_asm, mem::swap}; use core::{arch::global_asm, mem::swap};
use spin::Once; use spin::Once;

2
framework/jinux-frame/src/vm/frame_allocator.rs
View File

@ -3,7 +3,7 @@ use buddy_system_allocator::FrameAllocator;
use log::info; use log::info;
use spin::Once; 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 crate::{config::PAGE_SIZE, sync::SpinLock};
use super::{frame::VmFrameFlags, VmFrame}; use super::{frame::VmFrameFlags, VmFrame};

2
framework/jinux-frame/src/vm/mod.rs
View File

@ -29,7 +29,7 @@ pub use self::{
use alloc::vec::Vec; use alloc::vec::Vec;
use spin::Once; 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 /// Convert physical address to virtual address using offset, only available inside jinux-frame
pub(crate) fn paddr_to_vaddr(pa: usize) -> usize { pub(crate) fn paddr_to_vaddr(pa: usize) -> usize {