Skip to content

Commit ca1147f

Browse files
committed
ARC: [arcompact] entry.S: minor code movement
This is a non functional code changw, which moves r25 restore from macro into the caller of macro Signed-off-by: Vineet Gupta <[email protected]>
1 parent 6423496 commit ca1147f

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

arch/arc/include/asm/entry-compact.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@
234234
POP gp
235235
RESTORE_R12_TO_R0
236236

237+
#ifdef CONFIG_ARC_CURR_IN_REG
238+
ld r25, [sp, 12]
239+
#endif
237240
ld sp, [sp] /* restore original sp */
238241
/* orig_r0, ECR, user_r25 skipped automatically */
239242
.endm
@@ -315,6 +318,9 @@
315318
POP gp
316319
RESTORE_R12_TO_R0
317320

321+
#ifdef CONFIG_ARC_CURR_IN_REG
322+
ld r25, [sp, 12]
323+
#endif
318324
ld sp, [sp] /* restore original sp */
319325
/* orig_r0, ECR, user_r25 skipped automatically */
320326
.endm

arch/arc/include/asm/entry.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686
POP r1
8787
POP r0
8888

89-
#ifdef CONFIG_ARC_CURR_IN_REG
90-
ld r25, [sp, 12]
91-
#endif
9289
.endm
9390

9491
/*--------------------------------------------------------------

0 commit comments

Comments
 (0)