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

diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
index a1d25c3e28d1409a5cbc32c8a81b94a4dbd022b5..bc657e55c15f8e1dfb2ef718d138a40998ffc7b4 100644 (file)
--- 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