Module Name: src
Committed By: mrg
Date: Wed Jan 17 07:38:20 UTC 2018
Modified Files:
src/sys/arch/sparc/sparc: cpu.c cpuvar.h
Log Message:
fix previous:
CPUFLG_SUN4CACHEBUG was renamed to CACHE_TRAPPAGEBUG and moved
into the cacheinfo. don't revive the no longer used value, but
fix the non-sun4m code to match cpu.c 1.251.
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sparc/sparc/cpuvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.251 src/sys/arch/sparc/sparc/cpu.c:1.252
--- src/sys/arch/sparc/sparc/cpu.c:1.251 Tue Jan 16 08:23:17 2018
+++ src/sys/arch/sparc/sparc/cpu.c Wed Jan 17 07:38:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.251 2018/01/16 08:23:17 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.252 2018/01/17 07:38:20 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.251 2018/01/16 08:23:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.252 2018/01/17 07:38:20 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -1187,7 +1187,7 @@ getcacheinfo_sun4(struct cpu_info *sc, i
ci->c_l2linesize = 4;
ci->c_split = 0;
ci->c_nlines = ci->c_totalsize >> ci->c_l2linesize;
- sc->flags |= CPUFLG_SUN4CACHEBUG;
+ sc->cacheinfo.c_flags |= CACHE_TRAPPAGEBUG;
break;
case CPUTYP_4_400:
ci->c_vactype = VAC_WRITEBACK;
@@ -1321,7 +1321,7 @@ getcacheinfo_sun4c(struct cpu_info *sc,
* mysterious buserr-type variable....)
*/
if (prom_getpropint(node, "buserr-type", 0) == 1)
- sc->flags |= CPUFLG_SUN4CACHEBUG;
+ sc->cacheinfo.c_flags |= CACHE_TRAPPAGEBUG;
}
#endif /* SUN4C */
Index: src/sys/arch/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.96 src/sys/arch/sparc/sparc/cpuvar.h:1.97
--- src/sys/arch/sparc/sparc/cpuvar.h:1.96 Wed Jan 17 02:39:16 2018
+++ src/sys/arch/sparc/sparc/cpuvar.h Wed Jan 17 07:38:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.96 2018/01/17 02:39:16 christos Exp $ */
+/* $NetBSD: cpuvar.h,v 1.97 2018/01/17 07:38:20 mrg Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -157,7 +157,6 @@ struct module_info {
#define CPUFLG_HATCHED 0x1000 /* CPU is alive */
#define CPUFLG_PAUSED 0x2000 /* CPU is paused */
#define CPUFLG_GOTMSG 0x4000 /* CPU got an lev13 IPI */
-#define CPUFLG_SUN4CACHEBUG 0x8000 /* CPU has the sun4 cache bug */
/*
