Commit 9eaa9a82 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle

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: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14410/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3b4b8239
...@@ -2288,7 +2288,7 @@ config MIPS_MT_FPAFF ...@@ -2288,7 +2288,7 @@ config MIPS_MT_FPAFF
config MIPSR2_TO_R6_EMULATOR config MIPSR2_TO_R6_EMULATOR
bool "MIPS R2-to-R6 emulator" bool "MIPS R2-to-R6 emulator"
depends on CPU_MIPSR6 && !SMP depends on CPU_MIPSR6
default y default y
help help
Choose this option if you want to run non-R6 MIPS userland code. Choose this option if you want to run non-R6 MIPS userland code.
...@@ -2296,8 +2296,6 @@ config MIPSR2_TO_R6_EMULATOR ...@@ -2296,8 +2296,6 @@ config MIPSR2_TO_R6_EMULATOR
default. You can enable it using the 'mipsr2emu' kernel option. 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 The only reason this is a build-time option is to save ~14K from the
final kernel image. final kernel image.
comment "MIPS R2-to-R6 emulator is only available for UP kernels"
depends on SMP && CPU_MIPSR6
config MIPS_VPE_LOADER config MIPS_VPE_LOADER
bool "VPE loader support." bool "VPE loader support."
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment