summaryrefslogtreecommitdiff
path: root/arch/mips/pnx833x
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2016-05-18 00:08:49 +0100
committerRalf Baechle <ralf@linux-mips.org>2016-05-28 12:35:03 +0200
commit0f2d988d231373bd53d5102bf40792552ed11d87 (patch)
treeacdcfe06aa9b2d3324812e59f746d04f2e3d0ed9 /arch/mips/pnx833x
parentba01cf0e1244fc3e4a24b4a111148c0d70025b36 (diff)
MIPS: Fix incomplete separation of XPA CPU feature
Commit 12822570a29b ("MIPS: Separate XPA CPU feature into LPA and MVH") wasn't fully applied, possibly due to a conflict with commit f270d881fa55 ("MIPS: Detect MIPSr6 Virtual Processor support"). This left decode_config5() referring to the non-existent MIPS_CPU_XPA, which breaks the build when XPA is enabled: arch/mips/kernel/cpu-probe.c In function ‘decode_config5’: arch/mips/kernel/cpu-probe.c:838:17: error: ‘MIPS_CPU_XPA’ undeclared (first use in this function) c->options |= MIPS_CPU_XPA; ^ Apply the missing hunk, dropping the CONFIG_XPA ifdef and setting the MIPS_CPU_MVH option when Config5.MVH is set. Fixes: 12822570a29b ("MIPS: Separate XPA CPU feature into LPA and MVH") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Link: https://patchwork.linux-mips.org/patch/13112/ Patchwork: https://patchwork.linux-mips.org/patch/13277/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pnx833x')
0 files changed, 0 insertions, 0 deletions