From 857e48ed4e7214465f8b5a766bf6be5e96c76598 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 20 Dec 2021 08:32:42 +0100 Subject: [PATCH] Import `global_asm` macro which now lives under `core::arch` --- src/main.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 3ccac477..7b552ca9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,8 +10,7 @@ compile_error!("The bootloader crate must be compiled for the `x86_64-bootloader extern crate rlibc; use bootloader::bootinfo::{BootInfo, FrameRange}; -use core::convert::TryInto; -use core::panic::PanicInfo; +use core::{arch::global_asm, convert::TryInto, panic::PanicInfo}; use core::{mem, slice}; use fixedvec::alloc_stack; use usize_conversions::usize_from;