Module Name: src
Committed By: skrll
Date: Wed Jan 22 12:23:12 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: cpu.c
src/sys/arch/arm/include: cpu.h
Log Message:
#ifdef whack-a-mole for the pmap_maxproc_set functionality
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/arm/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.142 src/sys/arch/arm/arm32/cpu.c:1.143
--- src/sys/arch/arm/arm32/cpu.c:1.142 Mon Jan 20 22:13:57 2020
+++ src/sys/arch/arm/arm32/cpu.c Wed Jan 22 12:23:12 2020
@@ -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 @@ identify_features(device_t dv)
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
Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.106 src/sys/arch/arm/include/cpu.h:1.107
--- src/sys/arch/arm/include/cpu.h:1.106 Mon Jan 20 22:13:57 2020
+++ src/sys/arch/arm/include/cpu.h Wed Jan 22 12:23:12 2020
@@ -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 @@ vaddr_t cpu_uarea_alloc_idlelwp(struct c
*/
void cpu_attach(device_t, cpuid_t);
-#ifdef ARM_MMU_EXTENDED
+#ifdef _ARM_ARCH_6
int cpu_maxproc_hook(int);
#endif
