Merge tag 'for-linus' of git://github.com/openrisc/linux

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 5 years ago 56192707 66125d93

+2 -2

1 changed file

expand all

arch

openrisc

kernel

entry.S

+2 -2

arch/openrisc/kernel/entry.S

··· 1166 1166 l.movhi r29,hi(sys_clone) 1167 1167 l.ori r29,r29,lo(sys_clone) 1168 1168 l.j _fork_save_extra_regs_and_call 1169 - l.addi r7,r1,0 1169 + l.nop 1170 1170 1171 1171 ENTRY(__sys_fork) 1172 1172 l.movhi r29,hi(sys_fork) 1173 1173 l.ori r29,r29,lo(sys_fork) 1174 1174 l.j _fork_save_extra_regs_and_call 1175 - l.addi r3,r1,0 1175 + l.nop 1176 1176 1177 1177 ENTRY(sys_rt_sigreturn) 1178 1178 l.jal _sys_rt_sigreturn