diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2016-02-07 11:05:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-05-09 12:00:04 +0200 |
| commit | 8e85f275e934fe4e9be02c1d80583b042de5438c (patch) | |
| tree | abc10b7f12233a0bd46e3df149f5d3b640d8ae0d /arch/mips/lib/memset.S | |
| parent | 41fa29e4d8cf4150568a0fe9bb4d62229f9caed5 (diff) | |
| download | talos-obmc-linux-8e85f275e934fe4e9be02c1d80583b042de5438c.tar.gz talos-obmc-linux-8e85f275e934fe4e9be02c1d80583b042de5438c.zip | |
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 <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>
Diffstat (limited to 'arch/mips/lib/memset.S')
| -rw-r--r-- | arch/mips/lib/memset.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S index 8f0019a2e5c8..18a1ccd4d134 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 |
