Module Name: src
Committed By: skrll
Date: Mon Jan 20 22:13:58 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: cpu.c
src/sys/arch/arm/include: cpu.h
src/sys/arch/arm/include/arm32: pmap.h
Log Message:
s/_ARM_ARCH_6/ARM_MMU_EXTENDED/ in the #ifdef for the recent 4k pages
change
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/arm/include/arm32/pmap.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.141 src/sys/arch/arm/arm32/cpu.c:1.142
--- src/sys/arch/arm/arm32/cpu.c:1.141 Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/arm32/cpu.c Mon Jan 20 22:13:57 2020
@@ -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 @@ identify_features(device_t dv)
cpu_processor_features[0], cpu_processor_features[1]);
}
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
int
cpu_maxproc_hook(int nmaxproc)
{
Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.105 src/sys/arch/arm/include/cpu.h:1.106
--- src/sys/arch/arm/include/cpu.h:1.105 Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/include/cpu.h Mon Jan 20 22:13:57 2020
@@ -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 @@ vaddr_t cpu_uarea_alloc_idlelwp(struct c
*/
void cpu_attach(device_t, cpuid_t);
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
int cpu_maxproc_hook(int);
#endif
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.159 src/sys/arch/arm/include/arm32/pmap.h:1.160
--- src/sys/arch/arm/include/arm32/pmap.h:1.159 Sat Jan 18 14:40:04 2020
+++ src/sys/arch/arm/include/arm32/pmap.h Mon Jan 20 22:13:58 2020
@@ -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 @@ bool pmap_extract(pmap_t, vaddr_t, paddr
void pmap_prefer(vaddr_t, vaddr_t *, int);
#endif
-#ifdef _ARM_ARCH_6
+#ifdef ARM_MMU_EXTENDED
int pmap_maxproc_set(int);
#endif
