summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStafford Horne <shorne@gmail.com>2020-04-22 20:24:11 +0900
committerStafford Horne <shorne@gmail.com>2020-06-01 06:15:32 +0900
commit6bd140e14d9aaa734ec37985b8b20a96c0ece948 (patch)
tree314bfb59ef74d6fc826c86108954e5893415a537
parentae83d0b416db002fe95601e7f97f64b59514d936 (diff)
downloadlinux-6bd140e14d9aaa734ec37985b8b20a96c0ece948.tar.gz
linux-6bd140e14d9aaa734ec37985b8b20a96c0ece948.tar.bz2
linux-6bd140e14d9aaa734ec37985b8b20a96c0ece948.zip
openrisc: Fix issue with argument clobbering for clone/fork
Working on the OpenRISC glibc port I found that sometimes clone was working strange. That the tls data argument sent in r7 was always wrong. Further investigation revealed that the arguments were getting clobbered in the entry code. This patch removes the code that writes to the argument registers. This was likely due to some old code hanging around. This patch fixes this up for clone and fork. This fork clobber is harmless but also useless so remove. Signed-off-by: Stafford Horne <shorne@gmail.com>
-rw-r--r--arch/openrisc/kernel/entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
index e4a78571f883..c6481cfc5220 100644
--- a/arch/openrisc/kernel/entry.S
+++ b/arch/openrisc/kernel/entry.S
@@ -1166,13 +1166,13 @@ ENTRY(__sys_clone)
l.movhi r29,hi(sys_clone)
l.ori r29,r29,lo(sys_clone)
l.j _fork_save_extra_regs_and_call
- l.addi r7,r1,0
+ l.nop
ENTRY(__sys_fork)
l.movhi r29,hi(sys_fork)
l.ori r29,r29,lo(sys_fork)
l.j _fork_save_extra_regs_and_call
- l.addi r3,r1,0
+ l.nop
ENTRY(sys_rt_sigreturn)
l.jal _sys_rt_sigreturn