8e7c12b684
Manually rebased: - layerscape/patches-5.4/801-audio-0037-MLK-16224-4-ASoC-fsl_sai-support-multi-fifo-and-DSD.patch - ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
15 lines
356 B
Diff
15 lines
356 B
Diff
--- a/arch/mips/kernel/vpe-mt.c
|
|
+++ b/arch/mips/kernel/vpe-mt.c
|
|
@@ -131,7 +131,10 @@ int vpe_run(struct vpe *v)
|
|
* kernels need to turn it on, even if that wasn't the pre-dvpe() state.
|
|
*/
|
|
#ifdef CONFIG_SMP
|
|
- evpe(vpeflags);
|
|
+ if (!setup_max_cpus) /* nosmp is set */
|
|
+ evpe(EVPE_ENABLE);
|
|
+ else
|
|
+ evpe(vpeflags);
|
|
#else
|
|
evpe(EVPE_ENABLE);
|
|
#endif
|