diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 10:54:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 10:54:09 -0700 |
| commit | 56192707bd8330355d3d1746d99e808eca1999d7 (patch) | |
| tree | b37e43791ce8594c623a4e12240250ae2d247d11 | |
| parent | 66125d934b39889372b8d75e4c192818656efb80 (diff) | |
| parent | 6bd140e14d9aaa734ec37985b8b20a96c0ece948 (diff) | |
| download | lwn-56192707bd8330355d3d1746d99e808eca1999d7.tar.gz lwn-56192707bd8330355d3d1746d99e808eca1999d7.zip | |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC update from Stafford Horne:
"One patch found wile I was getting the glibc port ready: fix issue
with clone TLS arg getting overwritten"
* tag 'for-linus' of git://github.com/openrisc/linux:
openrisc: Fix issue with argument clobbering for clone/fork
| -rw-r--r-- | arch/openrisc/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S index a1d25c3e28d1..bc657e55c15f 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 |