summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorAndreas Herrmann <andreas.herrmann@caviumnetworks.com>2014-05-28 23:52:11 +0200
committerRalf Baechle <ralf@linux-mips.org>2014-05-30 21:01:11 +0200
commitcd3f5389489146297eb2c11e4f9d1c4e8aaeb59f (patch)
treede6314e173eabcd41d37e519d55ab985862d2980 /arch/mips
parent45b585c8dcdc469bb40b58cc2801acd7a2332525 (diff)
downloadblackbird-op-linux-cd3f5389489146297eb2c11e4f9d1c4e8aaeb59f.tar.gz
blackbird-op-linux-cd3f5389489146297eb2c11e4f9d1c4e8aaeb59f.zip
MIPS: OCTEON: Add OCTEON3 to __get_cpu_type
Otherwise __builtin_unreachable might be called. Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com> Cc: linux-mips@linux-mips.org Cc: David Daney <ddaney.cavm@gmail.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: kvm@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7014/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/cpu-type.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
index e3308b42343e..b4e2bd87df50 100644
--- a/arch/mips/include/asm/cpu-type.h
+++ b/arch/mips/include/asm/cpu-type.h
@@ -163,6 +163,7 @@ static inline int __pure __get_cpu_type(const int cpu_type)
case CPU_CAVIUM_OCTEON:
case CPU_CAVIUM_OCTEON_PLUS:
case CPU_CAVIUM_OCTEON2:
+ case CPU_CAVIUM_OCTEON3:
#endif
#if defined(CONFIG_SYS_HAS_CPU_BMIPS32_3300) || \
OpenPOWER on IntegriCloud