summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorDeng-Cheng Zhu <dengcheng.zhu@imgtec.com>2014-02-28 10:23:03 -0800
committerRalf Baechle <ralf@linux-mips.org>2014-03-06 21:20:23 +0100
commit031365b471e3268e3b8d6991b2cf0bae6b5e8bdc (patch)
tree6f38366167555f09aca300312303fed77bc04a8d /arch/mips
parenteee5794881d50e8ac3a56c74d3131f2364f200b9 (diff)
downloadlinux-stable-031365b471e3268e3b8d6991b2cf0bae6b5e8bdc.tar.gz
linux-stable-031365b471e3268e3b8d6991b2cf0bae6b5e8bdc.tar.bz2
linux-stable-031365b471e3268e3b8d6991b2cf0bae6b5e8bdc.zip
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 <Steven.Hill@imgtec.com> Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com> Cc: linux-mips@linux-mips.org Cc: john@phrozen.org Patchwork: https://patchwork.linux-mips.org/patch/6589/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/mti-malta/malta-amon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c
index 592ac0427426..84ac523b0ce0 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;