Module Name: src
Committed By: chs
Date: Wed Jul 5 19:30:51 UTC 2017
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
the extent code cannot use the full range of u_long,
so ignore the last page before 4GB too. ok jmcneill@
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.8 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.9
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.8 Wed Jul 5 01:08:45 2017
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Wed Jul 5 19:30:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.8 2017/07/05 01:08:45 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.9 2017/07/05 19:30:51 chs 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.8 2017/07/05 01:08:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.9 2017/07/05 19:30:51 chs Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -410,8 +410,8 @@ initarm(void *arg)
#if !defined(_LP64)
/* Cannot map memory above 4GB */
- if (memory_addr + memory_size > 0x100000000)
- memory_size = 0x100000000 - memory_addr;
+ if (memory_addr + memory_size >= 0x100000000)
+ memory_size = 0x100000000 - memory_addr - PAGE_SIZE;
#endif
ram_size = (bus_size_t)memory_size;
