[src/trunk]: src/sys/arch/arm s/_ARM_ARCH_6/ARM_MMU_EXTENDED/ in the #ifdef f...

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

details:   https://anonhg.NetBSD.org/src/rev/5092d27c1315
branches:  trunk
changeset: 968570:5092d27c1315
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Jan 20 22:13:57 2020 +0000

description:
s/_ARM_ARCH_6/ARM_MMU_EXTENDED/ in the #ifdef for the recent 4k pages
change

diffstat:

 sys/arch/arm/arm32/cpu.c          |  6 +++---
 sys/arch/arm/include/arm32/pmap.h |  4 ++--
 sys/arch/arm/include/cpu.h        |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 0c1142de86ca -r 5092d27c1315 sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Mon Jan 20 21:38:29 2020 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Mon Jan 20 22:13:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.141 2020/01/18 14:40:04 skrll Exp $  */
+/*     $NetBSD: cpu.c,v 1.142 2020/01/20 22:13:57 skrll Exp $  */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.141 2020/01/18 14:40:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.142 2020/01/20 22:13:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -887,7 +887,7 @@
            cpu_processor_features[0], cpu_processor_features[1]);
 }
 
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
 int
 cpu_maxproc_hook(int nmaxproc)
 {
diff -r 0c1142de86ca -r 5092d27c1315 sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Mon Jan 20 21:38:29 2020 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Mon Jan 20 22:13:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.159 2020/01/18 14:40:04 skrll Exp $ */
+/*     $NetBSD: pmap.h,v 1.160 2020/01/20 22:13:58 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -383,7 +383,7 @@
 void   pmap_prefer(vaddr_t, vaddr_t *, int);
 #endif
 
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
 int    pmap_maxproc_set(int);
 #endif
 
diff -r 0c1142de86ca -r 5092d27c1315 sys/arch/arm/include/cpu.h
--- a/sys/arch/arm/include/cpu.h        Mon Jan 20 21:38:29 2020 +0000
+++ b/sys/arch/arm/include/cpu.h        Mon Jan 20 22:13:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.105 2020/01/18 14:40:04 skrll Exp $  */
+/*     $NetBSD: cpu.h,v 1.106 2020/01/20 22:13:57 skrll Exp $  */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -329,7 +329,7 @@
  */
 void   cpu_attach(device_t, cpuid_t);
 
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
 int    cpu_maxproc_hook(int);
 #endif