projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 41fa29e)
MIPS: memset.S: Disable code unused with non-R6 MIPS configs
authorMaciej W. Rozycki <macro@linux-mips.org>
Sun, 7 Feb 2016 11:05:58 +0000 (11:05 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 9 May 2016 10:00:04 +0000 (12:00 +0200)
This complements commit 8c56208aff77 ("MIPS: lib: memset: Add MIPS R6
support").

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12452/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/lib/memset.S patch | blob | blame | history

diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S
index 8f0019a2e5c84bcd4f439559dad479b44903269a..18a1ccd4d1348c0134ed9d755512b66d1f54779d 100644 (file)
--- a/arch/mips/lib/memset.S
+++ b/arch/mips/lib/memset.S
@@ -228,10 +228,12 @@
        .hidden __memset
        .endif
 
+#ifdef CONFIG_CPU_MIPSR6
 .Lbyte_fixup\@:
        PTR_SUBU        a2, $0, t0
        jr              ra
         PTR_ADDIU      a2, 1
+#endif /* CONFIG_CPU_MIPSR6 */
 
 .Lfirst_fixup\@:
        jr      ra