|
@@ -291,6 +291,12 @@ static inline int cpu_has_confreg(void)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
+static inline void set_elf_platform(int cpu, const char *plat)
|
|
|
+{
|
|
|
+ if (cpu == 0)
|
|
|
+ __elf_platform = plat;
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* Get the FPU Implementation/Revision.
|
|
|
*/
|
|
@@ -956,14 +962,12 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
|
|
|
c->cputype = CPU_CAVIUM_OCTEON_PLUS;
|
|
|
__cpu_name[cpu] = "Cavium Octeon+";
|
|
|
platform:
|
|
|
- if (cpu == 0)
|
|
|
- __elf_platform = "octeon";
|
|
|
+ set_elf_platform(cpu, "octeon");
|
|
|
break;
|
|
|
case PRID_IMP_CAVIUM_CN63XX:
|
|
|
c->cputype = CPU_CAVIUM_OCTEON2;
|
|
|
__cpu_name[cpu] = "Cavium Octeon II";
|
|
|
- if (cpu == 0)
|
|
|
- __elf_platform = "octeon2";
|
|
|
+ set_elf_platform(cpu, "octeon2");
|
|
|
break;
|
|
|
default:
|
|
|
printk(KERN_INFO "Unknown Octeon chip!\n");
|