summaryrefslogtreecommitdiffstats
path: root/arch/mips/lib/memcpy.S
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-11-17 09:32:38 +0000
committerRalf Baechle <ralf@linux-mips.org>2014-11-19 18:22:08 +0100
commit51b1029d9966060c6ad02030e6f251425b4f06c1 (patch)
tree727f8e0d2a9fddc98072151c052686df6498e7ed /arch/mips/lib/memcpy.S
parent6a8dff6ab16c903b0d8ef5fbf21543f39bf5d675 (diff)
downloadop-kernel-dev-51b1029d9966060c6ad02030e6f251425b4f06c1.zip
op-kernel-dev-51b1029d9966060c6ad02030e6f251425b4f06c1.tar.gz
MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller
Commit cf62a8b8134dd3 ("MIPS: lib: memcpy: Use macro to build the copy_user code") switched to a macro in order to build the memcpy symbols in preparation for the EVA support. However, this commit also removed the NOP instruction after the 'jr ra' when returning back to the caller. This had no visible side-effects since the next instruction was a load to the t0 register which was already in the clobbered list, but it may have undesired effects in the future if some other code is introduced in between the .Ldone and the .Ll_exc_copy labels. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: <stable@vger.kernel.org> # v3.15+ Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/8512/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/lib/memcpy.S')
-rw-r--r--arch/mips/lib/memcpy.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S
index c17ef80..5d3238a 100644
--- a/arch/mips/lib/memcpy.S
+++ b/arch/mips/lib/memcpy.S
@@ -503,6 +503,7 @@
STOREB(t0, NBYTES-2(dst), .Ls_exc_p1\@)
.Ldone\@:
jr ra
+ nop
.if __memcpy == 1
END(memcpy)
.set __memcpy, 0
OpenPOWER on IntegriCloud