Module Name: src
Committed By: matt
Date: Mon May 4 00:12:56 UTC 2015
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c
Log Message:
If not using LPAE, if memory ends at 4GB ignore the last page so physical_end
doesn't wrap to 0.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm32/arm32_boot.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/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.12 src/sys/arch/arm/arm32/arm32_boot.c:1.13
--- src/sys/arch/arm/arm32/arm32_boot.c:1.12 Mon Jan 12 01:18:38 2015
+++ src/sys/arch/arm/arm32/arm32_boot.c Mon May 4 00:12:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.12 2015/01/12 01:18:38 jakllsch Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.13 2015/05/04 00:12:56 matt Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -123,7 +123,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.12 2015/01/12 01:18:38 jakllsch Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.13 2015/05/04 00:12:56 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -268,6 +268,13 @@ initarm_common(vaddr_t kvm_base, vsize_t
break;
}
}
+#ifndef HAVE_ARM_LPAE
+ // If memory ends at 4GB (and wraps to 0), ignore
+ // the last page.
+ if (__predict_false(segend == 0 && start > 0)) {
+ segend = -PAGE_SIZE;
+ }
+#endif
uvm_page_physload(start, segend, start, segend,
vm_freelist);
