Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx> --- This couuld be rolled into the original linux-queue patch that extablishes CPU_CAVIUM_OCTEON_PLUS. arch/mips/kernel/cpu-probe.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index ee67aac..be5bb16 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -913,14 +913,15 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu) case PRID_IMP_CAVIUM_CN31XX: case PRID_IMP_CAVIUM_CN30XX: c->cputype = CPU_CAVIUM_OCTEON; - goto name_and_platform; + __cpu_name[cpu] = "Cavium Octeon"; + goto platform; case PRID_IMP_CAVIUM_CN58XX: case PRID_IMP_CAVIUM_CN56XX: case PRID_IMP_CAVIUM_CN50XX: case PRID_IMP_CAVIUM_CN52XX: c->cputype = CPU_CAVIUM_OCTEON_PLUS; -name_and_platform: - __cpu_name[cpu] = "Cavium Octeon"; + __cpu_name[cpu] = "Cavium Octeon+"; +platform: if (cpu == 0) __elf_platform = "octeon"; break; -- 1.6.6.1
