Module Name: src
Committed By: jmcneill
Date: Tue Jan 21 10:54:11 UTC 2020
Modified Files:
src/sys/arch/aarch64/include: vmparam.h
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Switch aarch64 to use a single freelist.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/include/vmparam.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/fdt/fdt_machdep.c
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/aarch64/include/vmparam.h
diff -u src/sys/arch/aarch64/include/vmparam.h:1.8 src/sys/arch/aarch64/include/vmparam.h:1.9
--- src/sys/arch/aarch64/include/vmparam.h:1.8 Sun Oct 28 10:18:34 2018
+++ src/sys/arch/aarch64/include/vmparam.h Tue Jan 21 10:54:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.8 2018/10/28 10:18:34 jmcneill Exp $ */
+/* $NetBSD: vmparam.h,v 1.9 2020/01/21 10:54:11 jmcneill Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -165,10 +165,8 @@
#define VM_PHYSSEG_MAX 64 /* XXX */
#define VM_PHYSSEG_STRAT VM_PSTRAT_BSEARCH
-#define VM_NFREELIST 3
+#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-#define VM_FREELIST_FIRST4GB 1
-#define VM_FREELIST_HIGHMEM 2
#elif defined(__arm__)
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.65 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.66
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.65 Wed Dec 18 21:46:03 2019
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Tue Jan 21 10:54:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.65 2019/12/18 21:46:03 riastradh Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.66 2020/01/21 10:54:11 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.65 2019/12/18 21:46:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.66 2020/01/21 10:54:11 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -271,11 +271,6 @@ fdt_add_boot_physmem(const struct fdt_me
bp->bp_pages = atop(eaddr) - bp->bp_start;
bp->bp_freelist = VM_FREELIST_DEFAULT;
-#ifdef _LP64
- if (m->end > 0x100000000)
- bp->bp_freelist = VM_FREELIST_HIGHMEM;
-#endif
-
#ifdef PMAP_NEED_ALLOC_POOLPAGE
const uint64_t memory_size = *(uint64_t *)arg;
if (atop(memory_size) > bp->bp_pages) {
