From 4ad6b0635a9cbf529d0ec69197257779e9435d5b Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 5 Dec 2008 19:08:22 -0800
Subject: [PATCH] --- yaml --- r: 123379 b: refs/heads/master c:
 6c6bd8b61d0c8ead18caaafb3490552565efbb64 h: refs/heads/master i:   123377:
 f454161f09693733a98069109ac62fe98327ff38   123375:
 d94bfadc26547ea2c03a01ee54ea4d60e263711f v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sparc/kernel/cpu_32.c   | 9 ++++++---
 trunk/arch/sparc/kernel/setup_32.c | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6e6a0a7ab0d2..55158cef3fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a563f016049bcdc9b0de0c8622afcf04b860e5e
+refs/heads/master: 6c6bd8b61d0c8ead18caaafb3490552565efbb64
diff --git a/trunk/arch/sparc/kernel/cpu_32.c b/trunk/arch/sparc/kernel/cpu_32.c
index d0fe5d249206..cdaf7630df81 100644
--- a/trunk/arch/sparc/kernel/cpu_32.c
+++ b/trunk/arch/sparc/kernel/cpu_32.c
@@ -152,8 +152,11 @@ void __cpuinit cpu_probe(void)
 	}
 
 	if (i == NSPARCCHIPS)
-		printk(KERN_DEBUG "psr.impl = 0x%x   psr.vers = 0x%x\n",
+	{
+		printk(KERN_ERR "CPU: Unknown chip, impl[0x%x] vers[0x%x]\n",
 		       psr_impl, psr_vers);
+		sparc_cpu_type = "Unknown CPU";
+	}
 
 	for (i = 0; i < NSPARCFPU; i++) {
 		if (linux_sparc_fpu[i].psr_impl == psr_impl)
@@ -164,8 +167,8 @@ void __cpuinit cpu_probe(void)
 	}
 
 	if (i == NSPARCFPU) {
-		printk(KERN_DEBUG "psr.impl = 0x%x  fsr.vers = 0x%x\n",
+		printk(KERN_ERR "FPU: Unknown chip, impl[0x%x] vers[0x%x]\n",
 		       psr_impl, fpu_vers);
-		sparc_fpu_type = linux_sparc_fpu[31].fp_name;
+		sparc_fpu_type = "Unknown FPU";
 	}
 }
diff --git a/trunk/arch/sparc/kernel/setup_32.c b/trunk/arch/sparc/kernel/setup_32.c
index 24fe3078bd4b..d21abbe26360 100644
--- a/trunk/arch/sparc/kernel/setup_32.c
+++ b/trunk/arch/sparc/kernel/setup_32.c
@@ -328,8 +328,8 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
 		   "CPU0ClkTck\t: %ld\n"
 #endif
 		   ,
-		   sparc_cpu_type ? sparc_cpu_type : "undetermined",
-		   sparc_fpu_type ? sparc_fpu_type : "undetermined",
+		   sparc_cpu_type,
+		   sparc_fpu_type ,
 		   romvec->pv_romvers,
 		   prom_rev,
 		   romvec->pv_printrev >> 16,