diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-09 09:15:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-03-09 09:15:33 +0000 |
| commit | bd6d9b4d35b41a143e2a5d90d10724707500130b (patch) | |
| tree | f5c784338b3dc2bff0d05d87bd9702bddc18d1e9 /sys | |
| parent | 38db31d70de09e2709145dcc5af6484b550e34a4 (diff) | |
print hotfix info at end of cpu attach line
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 7 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/cpu.c | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 114d4d07441..ee080bd584a 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.25 1998/02/26 10:38:58 johns Exp $ */ +/* $OpenBSD: autoconf.c,v 1.26 1998/03/09 09:15:28 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -1061,8 +1061,8 @@ mainbus_attach(parent, dev, aux) { struct confargs oca; register const char *const *ssp, *sp = NULL; -#if defined(SUN4C) || defined(SUN4M) struct confargs *ca = aux; +#if defined(SUN4C) || defined(SUN4M) register int node0, node; const char *const *openboot_special; #define L1A_HACK /* XXX hack to allow L1-A during autoconf */ @@ -1126,13 +1126,10 @@ mainbus_attach(parent, dev, aux) #define openboot_special4m ((void *)0) #endif -#if defined(SUN4M) if (CPU_ISSUN4) printf(": SUN-4/%d series\n", cpuinfo.classlvl); else printf(": %s\n", getpropstring(ca->ca_ra.ra_node, "name")); -#endif - printf("\n"); /* * Locate and configure the ``early'' devices. These must be diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c index 73ab3308abe..920eacba97c 100644 --- a/sys/arch/sparc/sparc/cpu.c +++ b/sys/arch/sparc/sparc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.12 1998/02/26 10:39:01 johns Exp $ */ +/* $OpenBSD: cpu.c,v 1.13 1998/03/09 09:15:32 deraadt Exp $ */ /* $NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */ /* @@ -76,6 +76,7 @@ char machine[] = MACHINE; /* from <machine/param.h> */ char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */ char cpu_model[100]; +char cpu_hotfix[40]; /* The CPU configuration driver. */ void cpu_attach __P((struct device *, struct device *, void *)); @@ -206,7 +207,10 @@ cpu_attach(parent, self, aux) sprintf(cpu_model, "%s @ %s MHz, %s FPU", sc->cpu_name, clockfreq(sc->hz), fpuname); - printf(": %s\n", cpu_model); + printf(": %s", cpu_model); + if (cpu_hotfix[0]) + printf("; %s", cpu_hotfix); + printf("\n"); if (sc->cacheinfo.c_totalsize != 0) cache_print(sc); @@ -573,7 +577,7 @@ sun4_hotfix(sc) { if ((sc->flags & CPUFLG_SUN4CACHEBUG) != 0) { kvm_uncache((caddr_t)trapbase, 1); - printf(": cache chip bug; trap page uncached"); + sprintf(cpu_hotfix, "cache chip bug - trap page uncached"); } } |