From 5a48ba31be1cccca0f4dc6911dee519875e2106f Mon Sep 17 00:00:00 2001 From: David Daney Date: Sat, 24 Sep 2011 02:29:54 +0200 Subject: [PATCH] --- yaml --- r: 273485 b: refs/heads/master c: a1431b61a874cc1e11a3a8d59a08144eb34ae9eb h: refs/heads/master i: 273483: 64c8b0c4c5a6da404f19e2c07e7110e2ac3aa9f8 v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/cpu-probe.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4040dec80e0a..c6af567edbe9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 074ef0d2752a54a73f0e368fad458e4b5a57c5f8 +refs/heads/master: a1431b61a874cc1e11a3a8d59a08144eb34ae9eb diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c index ebc0cd20b35d..aa327a755982 100644 --- a/trunk/arch/mips/kernel/cpu-probe.c +++ b/trunk/arch/mips/kernel/cpu-probe.c @@ -978,7 +978,10 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu) platform: set_elf_platform(cpu, "octeon"); break; + case PRID_IMP_CAVIUM_CN61XX: case PRID_IMP_CAVIUM_CN63XX: + case PRID_IMP_CAVIUM_CN66XX: + case PRID_IMP_CAVIUM_CN68XX: c->cputype = CPU_CAVIUM_OCTEON2; __cpu_name[cpu] = "Cavium Octeon II"; set_elf_platform(cpu, "octeon2");