Skip to content

Commit dbbec12

Browse files
committed
Add imports for asm and global_asm macros which are not in the prelude anymore
1 parent a1286ca commit dbbec12

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/bin/bios.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ use bootloader::{
1111
binary::SystemInfo,
1212
boot_info::{FrameBufferInfo, PixelFormat},
1313
};
14-
use core::panic::PanicInfo;
15-
use core::slice;
14+
use core::{
15+
arch::{asm, global_asm},
16+
panic::PanicInfo,
17+
slice,
18+
};
1619
use usize_conversions::usize_from;
1720
use x86_64::structures::paging::{FrameAllocator, OffsetPageTable};
1821
use x86_64::structures::paging::{

src/bin/uefi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use bootloader::{
1717
binary::{legacy_memory_region::LegacyFrameAllocator, parsed_config::CONFIG, SystemInfo},
1818
boot_info::FrameBufferInfo,
1919
};
20-
use core::{mem, panic::PanicInfo, slice};
20+
use core::{arch::asm, mem, panic::PanicInfo, slice};
2121
use uefi::{
2222
prelude::{entry, Boot, Handle, ResultExt, Status, SystemTable},
2323
proto::console::gop::{GraphicsOutput, PixelFormat},

src/binary/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::{
33
boot_info::{BootInfo, FrameBuffer, FrameBufferInfo, MemoryRegion, TlsTemplate},
44
};
55
use core::{
6+
arch::asm,
67
mem::{self, MaybeUninit},
78
slice,
89
};

0 commit comments

Comments
 (0)