All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] MIPS: Give Octeon+ CPUs their own __cpu_name
@ 2010-02-23 18:11 David Daney
  2010-02-23 22:53 ` Ralf Baechle
  0 siblings, 1 reply; 2+ messages in thread
From: David Daney @ 2010-02-23 18:11 UTC (permalink / raw)
  To: linux-mips, ralf; +Cc: David Daney

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] MIPS: Give Octeon+ CPUs their own __cpu_name
  2010-02-23 18:11 [PATCH] MIPS: Give Octeon+ CPUs their own __cpu_name David Daney
@ 2010-02-23 22:53 ` Ralf Baechle
  0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2010-02-23 22:53 UTC (permalink / raw)
  To: David Daney; +Cc: linux-mips

On Tue, Feb 23, 2010 at 10:11:47AM -0800, David Daney wrote:

> This couuld be rolled into the original linux-queue patch that
> extablishes CPU_CAVIUM_OCTEON_PLUS.

Done.

  Ralf

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-02-23 22:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-23 18:11 [PATCH] MIPS: Give Octeon+ CPUs their own __cpu_name David Daney
2010-02-23 22:53 ` Ralf Baechle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.