summaryrefslogtreecommitdiffstats
path: root/arch/csky
diff options
context:
space:
mode:
authorGuo Ren <guoren@linux.alibaba.com>2020-05-24 10:44:38 +0000
committerGuo Ren <guoren@linux.alibaba.com>2020-05-28 00:18:36 +0000
commite0bbb53843b5fdfe464b099217e3b9d97e8a75d7 (patch)
tree051f4bc65fe08337d910e3e3bcd2f99b69acbacf /arch/csky
parent900897591b2bf01154db8f59f6ecf8d60e60f15e (diff)
downloadlinux-stable-e0bbb53843b5fdfe464b099217e3b9d97e8a75d7.tar.gz
linux-stable-e0bbb53843b5fdfe464b099217e3b9d97e8a75d7.tar.bz2
linux-stable-e0bbb53843b5fdfe464b099217e3b9d97e8a75d7.zip
csky: Fixup abiv2 syscall_trace break a4 & a5
Current implementation could destory a4 & a5 when strace, so we need to get them from pt_regs by SAVE_ALL. Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Diffstat (limited to 'arch/csky')
-rw-r--r--arch/csky/abiv2/inc/abi/entry.h2
-rw-r--r--arch/csky/kernel/entry.S6
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/csky/abiv2/inc/abi/entry.h b/arch/csky/abiv2/inc/abi/entry.h
index 698df2f294be..6ee71bfc512a 100644
--- a/arch/csky/abiv2/inc/abi/entry.h
+++ b/arch/csky/abiv2/inc/abi/entry.h
@@ -13,6 +13,8 @@
#define LSAVE_A1 28
#define LSAVE_A2 32
#define LSAVE_A3 36
+#define LSAVE_A4 40
+#define LSAVE_A5 44
#define KSPTOUSP
#define USPTOKSP
diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S
index bfbef30f8a53..76dc7299681b 100644
--- a/arch/csky/kernel/entry.S
+++ b/arch/csky/kernel/entry.S
@@ -173,8 +173,10 @@ csky_syscall_trace:
ldw a3, (sp, LSAVE_A3)
#if defined(__CSKYABIV2__)
subi sp, 8
- stw r5, (sp, 0x4)
- stw r4, (sp, 0x0)
+ ldw r9, (sp, LSAVE_A4)
+ stw r9, (sp, 0x0)
+ ldw r9, (sp, LSAVE_A5)
+ stw r9, (sp, 0x4)
#else
ldw r6, (sp, LSAVE_A4)
ldw r7, (sp, LSAVE_A5)