summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2016-10-17 17:34:37 +0300
committerRalf Baechle <ralf@linux-mips.org>2017-01-03 18:34:42 +0300
commit9eaa9a82e5d6be2234482c3468ed56143c713729 (patch)
tree18d6d444bfd691df93bfc97a01dbd303fb513f90 /arch
parent3b4b82399c4557666d348bed1aefc21c999e79a1 (diff)
downloadlinux-9eaa9a82e5d6be2234482c3468ed56143c713729.tar.xz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 40908304d1ef..9a7730219c93 100644
--- 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."