Skip to content

Commit 8c67dfa

Browse files
committed
style(aarch64): import address types from crate root
1 parent 24c4663 commit 8c67dfa

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/arch/aarch64/kernel/interrupts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use free_list::PageLayout;
1414
use hashbrown::HashMap;
1515
use hermit_sync::{InterruptSpinMutex, InterruptTicketMutex, OnceCell, SpinMutex};
1616
use memory_addresses::VirtAddr;
17-
use memory_addresses::arch::aarch64::PhysAddr;
17+
use memory_addresses::PhysAddr;
1818

1919
use crate::arch::aarch64::kernel::core_local::increment_irq_counter;
2020
use crate::arch::aarch64::kernel::scheduler::State;

src/arch/aarch64/kernel/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use core::arch::global_asm;
1818
use core::sync::atomic::{AtomicPtr, AtomicU32, Ordering};
1919
use core::{ptr, str};
2020

21-
use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
21+
use memory_addresses::{PhysAddr, VirtAddr};
2222

2323
use crate::arch::aarch64::kernel::core_local::*;
2424
use crate::arch::aarch64::mm::paging::{BasePageSize, PageSize};

src/arch/aarch64/kernel/pci.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use bit_field::BitField;
55
use fdt::Fdt;
66
use fdt::node::FdtNode;
77
use free_list::PageLayout;
8-
use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
8+
use memory_addresses::{PhysAddr, VirtAddr};
99
use pci_types::{
1010
Bar, CommandRegister, ConfigRegionAccess, InterruptLine, InterruptPin, MAX_BARS, PciAddress,
1111
PciHeader,

src/arch/aarch64/kernel/scheduler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use aarch64_cpu::asm::barrier::{SY, isb};
88
use aarch64_cpu::registers::*;
99
use align_address::Align;
1010
use free_list::{PageLayout, PageRange};
11-
use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
11+
use memory_addresses::{PhysAddr, VirtAddr};
1212

1313
use crate::arch::aarch64::kernel::CURRENT_STACK_ADDRESS;
1414
use crate::arch::aarch64::kernel::core_local::core_scheduler;

src/arch/aarch64/kernel/systemtime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use core::str;
77
use free_list::PageLayout;
88
use hermit_entry::boot_info::PlatformInfo;
99
use hermit_sync::OnceCell;
10-
use memory_addresses::arch::aarch64::{PhysAddr, VirtAddr};
10+
use memory_addresses::{PhysAddr, VirtAddr};
1111
use time::OffsetDateTime;
1212

1313
use crate::arch::aarch64::mm::paging::{self, BasePageSize, PageSize, PageTableEntryFlags};

0 commit comments

Comments
 (0)