[src/trunk]: src/sys/arch/sparc/sparc More sun4m/sun4d common stuff.

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

details:   https://anonhg.NetBSD.org/src/rev/5bd113f9775d
branches:  trunk
changeset: 534126:5bd113f9775d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 17 15:57:12 2002 +0000

description:
More sun4m/sun4d common stuff.

diffstat:

 sys/arch/sparc/sparc/kgdb_machdep.c |  6 +++---
 sys/arch/sparc/sparc/machdep.c      |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 23be3e72efd5 -r 5bd113f9775d sys/arch/sparc/sparc/kgdb_machdep.c
--- a/sys/arch/sparc/sparc/kgdb_machdep.c       Wed Jul 17 15:56:20 2002 +0000
+++ b/sys/arch/sparc/sparc/kgdb_machdep.c       Wed Jul 17 15:57:12 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kgdb_machdep.c,v 1.10 2001/12/04 00:05:07 darrenr Exp $ */
+/*     $NetBSD: kgdb_machdep.c,v 1.11 2002/07/17 15:57:12 thorpej Exp $ */
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -371,8 +371,8 @@
                return (0);
 
        for (; va < eva; va += NBPG) {
-#if defined(SUN4M)
-               if (CPU_ISSUN4M) {
+#if defined(SUN4M) || defined(SUN4D)
+               if (CPU_HAS_SRMMU) {
                        pte = getpte4m(va);
                        if ((pte & SRMMU_TETYPE) != SRMMU_TEPTE)
                                return (0);
diff -r 23be3e72efd5 -r 5bd113f9775d sys/arch/sparc/sparc/machdep.c
--- a/sys/arch/sparc/sparc/machdep.c    Wed Jul 17 15:56:20 2002 +0000
+++ b/sys/arch/sparc/sparc/machdep.c    Wed Jul 17 15:57:12 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.196 2002/07/17 04:55:57 thorpej Exp $ */
+/*     $NetBSD: machdep.c,v 1.197 2002/07/17 15:57:12 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -1057,8 +1057,8 @@
        int res;
        int s;
 
-       if (CPU_ISSUN4M) {
-               printf("warning: ldcontrolb called in sun4m\n");
+       if (CPU_ISSUN4M || CPU_ISSUN4D) {
+               printf("warning: ldcontrolb called on sun4m/sun4d\n");
                return 0;
        }