Skip to content

Commit

Permalink
MIPS: Allow pre-r6 emulation on SMP MIPSr6 kernels
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/14410/
Signed-off-by: Ralf Baechle <[email protected]>
  • Loading branch information
paulburton authored and ralfbaechle committed Jan 3, 2017
1 parent 3b4b823 commit 9eaa9a8
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2288,16 +2288,14 @@ 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.
Even if you say 'Y' here, the emulator will still be disabled by
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."
Expand Down

0 comments on commit 9eaa9a8

Please sign in to comment.