From: Deng-Cheng Zhu Date: Fri, 28 Feb 2014 18:23:03 +0000 (-0800) Subject: MIPS: APRP: Choose the correct VPE loader by fixing the linking X-Git-Tag: upstream/snapshot3+hdmi~3280^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=031365b471e3268e3b8d6991b2cf0bae6b5e8bdc;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git MIPS: APRP: Choose the correct VPE loader by fixing the linking Now we have CONFIG_MIPS_VPE_LOADER and CONFIG_MIPS_VPE_LOADER_[CMP|MT]. The latter two are used by the 2 exclusive flavors. The vpe_run in malta-amon.c is for CMP APRP. Without the fix, this vpe_run will be used in MT APRP. Reviewed-by: Steven J. Hill Signed-off-by: Deng-Cheng Zhu Cc: linux-mips@linux-mips.org Cc: john@phrozen.org Patchwork: https://patchwork.linux-mips.org/patch/6589/ Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c index 592ac04..84ac523 100644 --- a/arch/mips/mti-malta/malta-amon.c +++ b/arch/mips/mti-malta/malta-amon.c @@ -72,7 +72,7 @@ int amon_cpu_start(int cpu, return 0; } -#ifdef CONFIG_MIPS_VPE_LOADER +#ifdef CONFIG_MIPS_VPE_LOADER_CMP int vpe_run(struct vpe *v) { struct vpe_notifications *n;