Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/arch/evbarm/fdt Pull up following revision(s) (reques...
details: https://anonhg.NetBSD.org/src/rev/c78a9985bdc4
branches: netbsd-8
changeset: 434223:c78a9985bdc4
user: snj <snj%NetBSD.org@localhost>
date: Fri Aug 25 05:39:52 2017 +0000
description:
Pull up following revision(s) (requested by jakllsch in ticket #220):
sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.12
Ignore 0-sized memory regions in the FDT.
diffstat:
sys/arch/evbarm/fdt/fdt_machdep.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r d42f740df2e7 -r c78a9985bdc4 sys/arch/evbarm/fdt/fdt_machdep.c
--- a/sys/arch/evbarm/fdt/fdt_machdep.c Fri Aug 25 05:38:06 2017 +0000
+++ b/sys/arch/evbarm/fdt/fdt_machdep.c Fri Aug 25 05:39:52 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.4.2.4 2017/07/25 02:09:32 snj Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.4.2.5 2017/08/25 05:39:52 snj Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.4.2.4 2017/07/25 02:09:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.4.2.5 2017/08/25 05:39:52 snj Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -235,7 +235,7 @@
for (index = 0;
fdtbus_get_reg64(memory, index, &addr, &size) == 0;
index++) {
- if (addr >= max_addr)
+ if (addr >= max_addr || size == 0)
continue;
if (addr + size > max_addr)
size = max_addr - addr;
Home |
Main Index |
Thread Index |
Old Index