From fa0bd870a2c429764f8adcd307f84666bfd7146f Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Thu, 28 Jan 2010 16:52:13 -0800
Subject: [PATCH] --- yaml --- r: 182092 b: refs/heads/master c:
 368bf8ef304f426be0a8a0be5b0e437747598c10 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/kernel/cpu-probe.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f05ec918f86b..cb82d7331d93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 874fd3b5acc20f2a464409045aef3b2288069787
+refs/heads/master: 368bf8ef304f426be0a8a0be5b0e437747598c10
diff --git a/trunk/arch/mips/kernel/cpu-probe.c b/trunk/arch/mips/kernel/cpu-probe.c
index 494e8ab48d63..9ea5ca89e85f 100644
--- a/trunk/arch/mips/kernel/cpu-probe.c
+++ b/trunk/arch/mips/kernel/cpu-probe.c
@@ -917,6 +917,8 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
 	case PRID_IMP_CAVIUM_CN52XX:
 		c->cputype = CPU_CAVIUM_OCTEON;
 		__cpu_name[cpu] = "Cavium Octeon";
+		if (cpu == 0)
+			__elf_platform = "octeon";
 		break;
 	default:
 		printk(KERN_INFO "Unknown Octeon chip!\n");