[src/trunk]: src/sys/arch/arm #ifdef whack-a-mole for the pmap_maxproc_set fu...

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

details:   https://anonhg.NetBSD.org/src/rev/31cccfff6b24
branches:  trunk
changeset: 968616:31cccfff6b24
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Jan 22 12:23:12 2020 +0000

description:
#ifdef whack-a-mole for the pmap_maxproc_set functionality

diffstat:

 sys/arch/arm/arm32/cpu.c   |  10 +++++++---
 sys/arch/arm/include/cpu.h |   4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 74cd051f29be -r 31cccfff6b24 sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Wed Jan 22 12:23:04 2020 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Wed Jan 22 12:23:12 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.142 2020/01/20 22:13:57 skrll Exp $  */
+/*     $NetBSD: cpu.c,v 1.143 2020/01/22 12:23:12 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.142 2020/01/20 22:13:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.143 2020/01/22 12:23:12 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -887,11 +887,15 @@
            cpu_processor_features[0], cpu_processor_features[1]);
 }
 
-#ifdef ARM_MMU_EXTENDED
+#ifdef _ARM_ARCH_6
 int
 cpu_maxproc_hook(int nmaxproc)
 {
 
+#ifdef ARM_MMU_EXTENDED
        return pmap_maxproc_set(nmaxproc);
+#else
+       return 0;
+#endif
 }
 #endif
diff -r 74cd051f29be -r 31cccfff6b24 sys/arch/arm/include/cpu.h
--- a/sys/arch/arm/include/cpu.h        Wed Jan 22 12:23:04 2020 +0000
+++ b/sys/arch/arm/include/cpu.h        Wed Jan 22 12:23:12 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.106 2020/01/20 22:13:57 skrll Exp $  */
+/*     $NetBSD: cpu.h,v 1.107 2020/01/22 12:23:12 skrll Exp $  */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -329,7 +329,7 @@
  */
 void   cpu_attach(device_t, cpuid_t);
 
-#ifdef ARM_MMU_EXTENDED
+#ifdef _ARM_ARCH_6
 int    cpu_maxproc_hook(int);
 #endif