Merge tag 'csky-for-linus-7.3' of https://github.com/c-sky/csky-linux

d10e148b · Linus Torvalds <[email protected]> · 2026-08-18 19:32:34 -07:00

Pull csky update from Guo Ren:

 - Fix a4/a5 restoration in syscall trace path

* tag 'csky-for-linus-7.3' of https://github.com/c-sky/csky-linux:
  csky: Fix a4/a5 restoration in syscall trace path

Commit: d10e148b27cd746cc5c27e30686153eb97e8d8d0
Parents: 5808ac18 · abb81e5c

Merge commit. Changes below are compared with the first parent: 5808ac18.

Changes

1 files changed · +3 −3

File	Status	Add	Del	Content
arch/csky/kernel/entry.S	modified	+3	−3	View file

arch/csky/kernel/entry.S

View file

diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S
index c68cdcc..3261f46 100644
--- a/arch/csky/kernel/entry.S
+++ b/arch/csky/kernel/entry.S
@@ -93,11 +93,11 @@ csky_syscall_trace:
 	ldw	a2, (sp, LSAVE_A2)
 	ldw	a3, (sp, LSAVE_A3)
 #if defined(__CSKYABIV2__)
-	subi	sp, 8
 	ldw	r9, (sp, LSAVE_A4)
+	ldw	r10, (sp, LSAVE_A5)
+	subi	sp, 8
 	stw	r9, (sp, 0x0)
-	ldw	r9, (sp, LSAVE_A5)
-	stw	r9, (sp, 0x4)
+	stw	r10, (sp, 0x4)
 	jsr	syscallid                     /* Do system call */
 	addi	sp, 8
 #else