Skip to content

Commit 23c0e16

Browse files
ABOSTMnashif
authored andcommitted
arch: arm: core: aarch32: fix regression introduced with Cortex-R
Regression introduced on ARMV6_M_ARMV8_M_BASELINE by Cortex-R PR #28231 Fixes #38421 Signed-off-by: Alexandre Bourdiol <[email protected]>
1 parent 7bf00c9 commit 23c0e16

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

arch/arm/core/aarch32/userspace.S

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,6 @@ dispatch_syscall:
548548
#elif defined(CONFIG_ARMV7_M_ARMV8_M_MAINLINE) \
549549
/* set stack back to unprivileged stack */
550550
ldr ip, [sp,#12]
551-
#endif
552-
553-
#if !defined(CONFIG_CPU_CORTEX_R)
554551
msr PSP, ip
555552
#endif
556553

0 commit comments

Comments
 (0)