MIPS: Allow pre-r6 emulation on SMP MIPSr6 kernels

There's no reason for the pre-r6 instruction emulation code to be
limited to uniprocessor kernels. We already emulate atomic memory access
instructions in a way that works for SMP systems, and nothing else
should be affected. Remove the artificial limitation, allowing pre-r6
instruction emulation to be used with SMP kernels.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14410/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4090830..9a77302 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2288,7 +2288,7 @@ config MIPS_MT_FPAFF
 
 config MIPSR2_TO_R6_EMULATOR
        bool "MIPS R2-to-R6 emulator"
-       depends on CPU_MIPSR6 && !SMP
+       depends on CPU_MIPSR6
        default y
        help
          Choose this option if you want to run non-R6 MIPS userland code.
@@ -2296,8 +2296,6 @@ config MIPSR2_TO_R6_EMULATOR
          default. You can enable it using the 'mipsr2emu' kernel option.
          The only reason this is a build-time option is to save ~14K from the
          final kernel image.
-comment "MIPS R2-to-R6 emulator is only available for UP kernels"
-       depends on SMP && CPU_MIPSR6
 
 config MIPS_VPE_LOADER
        bool "VPE loader support."