From e3c0874275947427fdc8a149f5e94f58b06f22c1 Mon Sep 17 00:00:00 2001 From: Bradley Bolen Date: Wed, 9 Feb 2022 08:57:35 -0500 Subject: [PATCH] arch: arm: core: aarch32: Fix Cortex-M userspace regression This was introduced when trying to fix a previous merge conflict. It broke userspace tests on nucleo_l073rz. Fixes #42627 Signed-off-by: Bradley Bolen --- arch/arm/core/aarch32/userspace.S | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/core/aarch32/userspace.S b/arch/arm/core/aarch32/userspace.S index 904453ca4946c..eea1db9ee8e15 100644 --- a/arch/arm/core/aarch32/userspace.S +++ b/arch/arm/core/aarch32/userspace.S @@ -524,9 +524,6 @@ dispatch_syscall: #elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE) /* set stack back to unprivileged stack */ ldr ip, [sp,#12] -#endif - -#if !defined(CONFIG_ARMV7_R) msr PSP, ip #endif