From b01c113e989548fb7b4a890b3d74fcbd8e04244d Mon Sep 17 00:00:00 2001
From: bjh21 <bjh21@NetBSD.org>
Date: Sat, 10 Mar 2001 20:03:51 +0000
Subject: [PATCH] ARM7TDMI != ARM7 for our purposes (it has an ARMv4 CP15).

---
 sys/arch/arm32/arm32/cpufunc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/arch/arm32/arm32/cpufunc.c b/sys/arch/arm32/arm32/cpufunc.c
index cfc0f78240b3..07c8b427f6f5 100644
--- a/sys/arch/arm32/arm32/cpufunc.c
+++ b/sys/arch/arm32/arm32/cpufunc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.c,v 1.16 2001/03/06 22:29:13 bjh21 Exp $	*/
+/*	$NetBSD: cpufunc.c,v 1.17 2001/03/10 20:03:51 bjh21 Exp $	*/
 
 /*
  * arm8 support code Copyright (c) 1997 ARM Limited
@@ -362,7 +362,8 @@ set_cpufuncs()
 #endif	/* CPU_ARM6 */
 #ifdef CPU_ARM7
 	if ((cputype & CPU_ID_IMPLEMENTOR_MASK) == CPU_ID_ARM_LTD &&
-	    (cputype & 0x0000f000) == 0x00007000) {
+	    CPU_ID_IS7(cputype) &&
+	    (cputype & CPU_ID_7ARCH_MASK) == CPU_ID_7ARCH_V3) {
 		cpufuncs = arm7_cpufuncs;
 		cpu_reset_needs_v4_MMU_disable = 0;
 		return 0;