[src/trunk]: src/sys/arch/sparc/sparc fix previous:

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4399381b0767
branches:  trunk
changeset: 829111:4399381b0767
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jan 17 07:38:20 2018 +0000

description:
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.

diffstat:

 sys/arch/sparc/sparc/cpu.c    |  8 ++++----
 sys/arch/sparc/sparc/cpuvar.h |  3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 61fd204e2765 -r 4399381b0767 sys/arch/sparc/sparc/cpu.c
--- a/sys/arch/sparc/sparc/cpu.c        Wed Jan 17 06:10:27 2018 +0000
+++ b/sys/arch/sparc/sparc/cpu.c        Wed Jan 17 07:38:20 2018 +0000
@@ -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 @@
                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 @@
         * mysterious buserr-type variable....)
         */
        if (prom_getpropint(node, "buserr-type", 0) == 1)
-               sc->flags |= CPUFLG_SUN4CACHEBUG;
+               sc->cacheinfo.c_flags |= CACHE_TRAPPAGEBUG;
 }
 #endif /* SUN4C */
 
diff -r 61fd204e2765 -r 4399381b0767 sys/arch/sparc/sparc/cpuvar.h
--- a/sys/arch/sparc/sparc/cpuvar.h     Wed Jan 17 06:10:27 2018 +0000
+++ b/sys/arch/sparc/sparc/cpuvar.h     Wed Jan 17 07:38:20 2018 +0000
@@ -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 @@
 #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 */
 
 
 /*