From 8e85f275e934fe4e9be02c1d80583b042de5438c Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Sun, 7 Feb 2016 11:05:58 +0000 Subject: [PATCH] MIPS: memset.S: Disable code unused with non-R6 MIPS configs This complements commit 8c56208aff77 ("MIPS: lib: memset: Add MIPS R6 support"). Signed-off-by: Maciej W. Rozycki Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12452/ Signed-off-by: Ralf Baechle --- arch/mips/lib/memset.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S index 8f0019a..18a1ccd 100644 --- 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 -- 2.7.4