From 49fcafac458dfe45223b534034b2a94a9250c462 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 19 Aug 2022 16:12:42 -0600 Subject: [PATCH] Fix building on aarch64 --- src/arch/aarch64/start.rs | 3 +-- src/context/arch/aarch64.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/arch/aarch64/start.rs b/src/arch/aarch64/start.rs index 027c5c8..b02e179 100644 --- a/src/arch/aarch64/start.rs +++ b/src/arch/aarch64/start.rs @@ -202,8 +202,7 @@ pub unsafe extern fn kstart_ap(args_ptr: *const KernelArgsAp) -> ! { pub unsafe fn usermode(ip: usize, sp: usize, arg: usize, _singlestep: usize) -> ! { core::arch::asm!( " - 1: - b 1f + udf #0 ", options(noreturn) ); diff --git a/src/context/arch/aarch64.rs b/src/context/arch/aarch64.rs index 3a674ae..e765295 100644 --- a/src/context/arch/aarch64.rs +++ b/src/context/arch/aarch64.rs @@ -434,8 +434,7 @@ pub struct SignalHandlerStack { unsafe extern fn signal_handler_wrapper() { core::arch::asm!( " - 1: - b 1f + udf #0 ", options(noreturn) );