From b1226606398d9da861af1514629013a73af92304 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 17 Jul 2002 15:57:12 +0000
Subject: [PATCH] More sun4m/sun4d common stuff.

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

diff --git a/sys/arch/sparc/sparc/kgdb_machdep.c b/sys/arch/sparc/sparc/kgdb_machdep.c
index 8e91c248eedc..27adeca98f23 100644
--- a/sys/arch/sparc/sparc/kgdb_machdep.c
+++ b/sys/arch/sparc/sparc/kgdb_machdep.c
@@ -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 @@ kgdb_acc(va, len)
 		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 --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 0fc628e4a91a..cc957e3b5267 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -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 @@ caddr_t addr;
 	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;
 	}