aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-12-05 19:08:22 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-05 19:08:22 -0800
commit6c6bd8b61d0c8ead18caaafb3490552565efbb64 (patch)
tree508586a66bee67011c2e5302f01ec753870856cb /arch/sparc
parent8a563f016049bcdc9b0de0c8622afcf04b860e5e (diff)
sparc: report "Unknown CPU/FPU" for unknown cpu/fpu
If we cannot determine the CPU or FPU report "Unknown CPU" or "Unknown FPU" like sparc64 does. And report with KERN_ERR that we cannot determine the CPU. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/cpu_32.c9
-rw-r--r--arch/sparc/kernel/setup_32.c4
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/sparc/kernel/cpu_32.c b/arch/sparc/kernel/cpu_32.c
index d0fe5d24920..cdaf7630df8 100644
--- a/arch/sparc/kernel/cpu_32.c
+++ b/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/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 24fe3078bd4..d21abbe2636 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/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,